Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 7 Jul 2010 13:28:44 +0000 (16:28 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 7 Jul 2010 13:28:44 +0000 (16:28 +0300)
commitfd3018cd238e16a2d35e95b284d375768195263e
treef5f65204edf2568e65f70533db6d9e86c2118719
parenta5892df10ac56fea3551e34e6ca739e25f995946
parent35cc0d81267c6226464ee9f3d6cc97a1fb2d50b1
Merge branch 'master' into harmattan