Merge branch 'master' into harmattan
authorDominic Velikakath <dominic.velikakath@nokia.com>
Mon, 24 Jan 2011 11:06:34 +0000 (16:36 +0530)
committerDominic Velikakath <dominic.velikakath@nokia.com>
Mon, 24 Jan 2011 11:06:34 +0000 (16:36 +0530)
commit6b04b7aeb153f1d1939c32ef221d31b81020ce66
treed898e244f593383f57e076724972322ea211ee04
parenta2343b94d90abeba4906ce3bafb7008007feec6b
parent1fd7973a3207ce790737a059b7e789a7f1c488f5
Merge branch 'master' into harmattan