Merge branch 'master' into harmattan
authorDominic Velikakath <dominic.velikakath@nokia.com>
Thu, 26 May 2011 11:18:31 +0000 (16:48 +0530)
committerDominic Velikakath <dominic.velikakath@nokia.com>
Thu, 26 May 2011 11:18:31 +0000 (16:48 +0530)
commit285b1a4083de04871cf8fb46e1911dc25b9bf243
tree8558f502455b9ee9513866938b4e2ea41a95d961
parenta93e29f21816ebc25c5e79840a6a42c4ebda1a03
parentac525a11205c32a7975c9119cdb3564199402181
Merge branch 'master' into harmattan