Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 25 May 2011 12:05:24 +0000 (15:05 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 25 May 2011 12:05:24 +0000 (15:05 +0300)
commit44632ab2e77f5dcaf03bad807779fa06b2147315
tree4ad84f9050be43f047d9e267aaf70faf5f91b159
parentbbcf6ec9d39809a0a125c38370178315fdfdb08d
parent05479022571aecbf2520a3b728b5c845c373ee1d
Merge branch 'master' into harmattan