Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 2 Aug 2010 07:04:52 +0000 (10:04 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 2 Aug 2010 07:04:52 +0000 (10:04 +0300)
commit8a56b474281ec0f3b95b0a49eba22d2a4fda9c98
tree7065de7f36084796ab289afbe77301f5813e4034
parent1caa8cf6a5a0effacdcabe22bd19ccb863be0d84
parenta62ed7f4f4afdeb63666bfa2fc2ef64bc2c50823
Merge branch 'master' into harmattan