Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 11 Mar 2010 10:12:44 +0000 (12:12 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 11 Mar 2010 10:12:44 +0000 (12:12 +0200)
commit475f31ab3678e3d59a50f0c568f6074c77fd4930
treef09f542f0f6fd6f52a5c004946d82d0707af743c
parentd1441e471e8a771b4c917979bd5116b90fd206eb
parentb7a4640468cd8bfd60117b1cf5edccf320991b62
Merge branch 'master' into harmattan