Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Thu, 8 Dec 2011 17:15:28 +0000 (19:15 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Thu, 8 Dec 2011 17:15:28 +0000 (19:15 +0200)
commitcfe32196038b957288de8a7f144e9e4f5acb71c5
tree25e2597701d8c4a1dde7a4f12b23a446dec76204
parent84577e5f9258fba670afbb0cff5d998e31d1ed9c
parentc56a09e9c0a40b4771829bf1143310755cf8c8fd
Merge branch 'master' into harmattan