Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 20 May 2011 08:23:20 +0000 (11:23 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 20 May 2011 08:23:20 +0000 (11:23 +0300)
commite0da28f6b6ddc7d8436362323a017369119e0e05
tree8d1b4177cab90d7ddd54b270f8b2da9fb7498d2b
parent7dc915376c07f934be23bdd301820d1de428f15f
parentbb6c4792ec2e66a9eab3d5f19ddcdbe27fde2eb4
Merge branch 'master' into harmattan