Merge branch 'master' into harmattan
authorDominic Velikakath <dominic.velikakath@nokia.com>
Fri, 18 Feb 2011 12:04:09 +0000 (17:34 +0530)
committerDominic Velikakath <dominic.velikakath@nokia.com>
Fri, 18 Feb 2011 12:04:09 +0000 (17:34 +0530)
commitd4b39e39537094afd9c6d0c5acb863f10d0217a9
tree7bb4d9c0e63f2e8d579d08b2aff57616122ec95d
parenta300220b5137cae4eefb6ab91923c61f0fd4be94
parent30eed30882f99aa6ad62a0bdbab51f68ecd07688
Merge branch 'master' into harmattan