Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 27 Jan 2011 09:23:45 +0000 (11:23 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 27 Jan 2011 09:23:45 +0000 (11:23 +0200)
commit96680f7f6a60c2872432af146ca0f0f99e40c31e
treeaf3c11f4a5878bb8288fdd949d3e0157624d4738
parentd44e058572892da39facebea633cb20847f0880e
parent90908706ae19e4139a2c4ada5a32b3d80830105f
Merge branch 'master' into harmattan