Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 21 Mar 2011 19:52:11 +0000 (21:52 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 21 Mar 2011 19:52:11 +0000 (21:52 +0200)
commitc2883647cdc9b8e5d8a8222dca94b2a426418284
treeaa24dc637f3c28d6813c2b2ed059ddad2cbc50c4
parentd8a712d6cd696e18f14a874e593fc7c61a9bec40
parentbbacd1eb93b9bb9ea48d75428d9dac7f6e52154f
Merge branch 'master' into harmattan