Have Kareena Kapoor Khan and Bipasha Basu ended their cold war

We all know about Kareena Kapoor Khan and Bipasha Basu have always shared not so friendly vibes. But recently when they came face-to-face at IIFA press conference, both the actors didn?t shy away from greeting each other. That?s not all! The Kapoor gal and her Ajnabee co-star even shared a kiss and a warm hug.