20100703 entertainment.hindi.bollywood: Ranbir patches up Jha; Nana