Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 5 Dec 2011 12:55:24 +0000 (14:55 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 5 Dec 2011 12:55:24 +0000 (14:55 +0200)
commit08f216adc777840923e900737c06eda961ed9d3e
treed57b2bf25f5e83d21489a6b0ebdcc9d185501830
parent316f8be1a3be1bde5adee321cf28b06d25657e2f
parent03afa40f0e14bc1845a8a87cf79dee50479fea5c
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri