Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 3 Nov 2010 13:46:50 +0000 (15:46 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 3 Nov 2010 13:46:50 +0000 (15:46 +0200)
commit4be5e65fcb2ce0279edf03006af36092d8eaa147
tree710e2166e6a8ac79831b2fece7e3618715fb54e9
parent2ad315514baf718f9f4b95c08ff7d50d5257a987
parentea59d35229163c823ea2bd7e25545040c036a1e4
Merge branch 'master' into harmattan