Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 31 Jan 2011 08:33:48 +0000 (10:33 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 31 Jan 2011 08:33:48 +0000 (10:33 +0200)
commitfec2b7a07b3ab82df631c9031f96b9a162398535
tree1dcec99d26b86082cab0b28415c984e1336b23f5
parentcb5797b0d830e3e661927f8aafbb4a7fde155ff5
parente0d92d87893a44623fc9f8782a713834ed80056b
Merge branch 'master' into harmattan