Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 3 Nov 2010 14:44:00 +0000 (16:44 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 3 Nov 2010 14:44:00 +0000 (16:44 +0200)
commit18642c6f008fe017eeb214fef322f75ed855d589
treee411a0f5ba302d1fac6ac2646222b3e99cefb247
parentdd0f272e78b5ee5afadcca1b99954a95ad75d180
parent851cb7b4124d295ce80db9123f5b3301386c0c0a
Merge branch 'master' into harmattan