Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Thu, 10 Nov 2011 11:34:52 +0000 (13:34 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Thu, 10 Nov 2011 11:34:52 +0000 (13:34 +0200)
commitfc52b10afbecdeab067a77305e9e5bc73e559bf6
tree83c973601d6e791f521a76f91a4068c390259fcd
parent277d85f3bec8b72bf76d7a3cb4177edc60c0a888
parentdef0e455d03a1fac23ec15ebb388e0dae9e9742d
Merge branch 'master' into harmattan