Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Fri, 9 Dec 2011 14:05:53 +0000 (16:05 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Fri, 9 Dec 2011 14:05:53 +0000 (16:05 +0200)
commitb21321e232953db77d558b54e7b51e5d10f165c6
tree8ff0d14370024077692a783450ee0af11f54c10b
parentd7094b69078c4ee289d0c0b70e4d243f496da80b
parent52769bb3719794233a59f751f3f337a5ae7ef8a0
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri
common-vars.pri