Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Fri, 23 Mar 2012 12:25:20 +0000 (14:25 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Fri, 23 Mar 2012 12:25:20 +0000 (14:25 +0200)
commit74ae990cc204e18967f98e07f30a762fcc5a3036
treed7ba334f14efb0b8a4164bc27f8aba057206d44e
parent62a748929cfeeb6ba8b047b1d82e0a66fdb97023
parent0a8afcb113463e3995da383ca04cf8ee1b3f5534
Merge branch 'master' into harmattan