Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 30 Apr 2010 12:19:23 +0000 (15:19 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 30 Apr 2010 12:19:23 +0000 (15:19 +0300)
commit6d464e40bb79171a67e8ab05e3ee1976456b7c7e
treed09ab815ebed627b056a5b60b423cfd512a86d45
parent74d75c7e45c3d5e9ad7990a9a52bef86f51d5863
parentbaefa902018b7b7c3af7ca4660d720efcbe2cef2
Merge branch 'master' into harmattan