Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 21 Feb 2011 12:43:58 +0000 (14:43 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 21 Feb 2011 12:43:58 +0000 (14:43 +0200)
commit20fa66f626b4347dfa9eae237701899f3cfdd555
tree63797563944ba91fddf4a6fd9e4b7b78a6bb1d7e
parent0e0f8fd943335701aeeded78e35382ce0761d6a9
parent41b2f65ecde5f16cf0de086f05d83f61efb81870
Merge branch 'master' into harmattan