Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 28 Jun 2010 08:08:53 +0000 (11:08 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 28 Jun 2010 08:08:53 +0000 (11:08 +0300)
commit4db99fb0cf545c0462bbe565978510a1cd53ac08
treea9deb4a3e8695aee25e4b03c3c334a9ffece5d98
parent3132dca54b517247add8a7b629bb2a574fad0282
parente7a8c15a109709650eef779be71d68424f931a0b
Merge branch 'master' into harmattan