Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Sun, 19 Jun 2011 08:19:55 +0000 (11:19 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Sun, 19 Jun 2011 08:19:55 +0000 (11:19 +0300)
commit089998837f865d9a60f1c678d777d8425282a913
treefce18a08ca8f7dbff7b470cbd1a47be247ddd4c1
parent66f9de03a6d369dedcacb17da683b93ca3699cc6
parentb29cbfc82feb9864f4a15bca72505c8ab83b76bd
Merge branch 'master' into harmattan