Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 21 Jun 2011 10:50:37 +0000 (13:50 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 21 Jun 2011 10:50:37 +0000 (13:50 +0300)
commit8a56ac63f3e5af3bba69d1952c7eeff68024f6b7
tree8d041f275c50d1e46ee2f4a00c8fe45267034928
parent2300330cdb5f968053288ae122834d13ba00777d
parent90e8265f0d9f19b643ba869f297cebf7d7ab033e
Merge branch 'master' into harmattan