Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 16 Dec 2010 13:50:03 +0000 (15:50 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 16 Dec 2010 13:50:03 +0000 (15:50 +0200)
commit5b2e6a30c7dacc6969ce4384a568e09a598534e8
tree4ff4708dd3d0fe4244a6d9d29a990ca25238f44f
parentb059d3511b06d1b856ecc6051e2ce76a4e5d8510
parent46a78bd124d402ecc73ac1aeb35f8b0428d2d03a
Merge branch 'master' into harmattan