Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 11 Jan 2011 09:41:04 +0000 (11:41 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 11 Jan 2011 09:41:04 +0000 (11:41 +0200)
commit640ee3ae5d716486fad6934c0a46685ac7b248ad
treea9928924a8fd14555ae9577d70159d5499cc9120
parenta8c335e55eef368b26f31bba52c69d3beb46a9d7
parentf43763fe3591a72ed0bed9309f4a763c7036441b
Merge branch 'master' into harmattan