Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 18 May 2011 08:41:31 +0000 (11:41 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 18 May 2011 08:41:31 +0000 (11:41 +0300)
commitd587cddaa760e0752640cfe52d5e06c470ea4eab
tree95193aab820f1da64c6b3952641f03de90999182
parent15aed508c5f1e1d3f395991cf6e6655d99f04346
parent8395c35c0bfad3410276b0da156ae3a349cbde64
Merge branch 'master' into harmattan