Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 4 May 2011 07:13:34 +0000 (10:13 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 4 May 2011 07:13:34 +0000 (10:13 +0300)
commita31f994db03608e3846146c174ab57358715584e
treef62ca9bdb5687be860c40906991203dcd3942925
parentf1bef18b00312415443873d3608e16f4445ee312
parenta061815dbb3573ac631e292b16f18feb25940cb9
Merge branch 'master' into harmattan