Merge branch 'master' into harmattan
authorDominic Velikakath <dominic.velikakath@nokia.com>
Wed, 11 May 2011 08:52:52 +0000 (14:22 +0530)
committerDominic Velikakath <dominic.velikakath@nokia.com>
Wed, 11 May 2011 08:52:52 +0000 (14:22 +0530)
commit2791faaa176ed08c639cbd70a8783d9c82f9f9f9
tree2ec4e9a141f129e1bb8907e87b8a2fd5a4dcddc8
parent1a2f1f48566a05dd1041cfc103adc66208babeb4
parentaf3ad075ade2a0a7e4f5d0e675de03923e2eef46
Merge branch 'master' into harmattan