Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 9 Jan 2012 12:00:03 +0000 (14:00 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 9 Jan 2012 12:00:03 +0000 (14:00 +0200)
commit25243c4d416f1350015e478ca4fb94e0fe2eb2cd
tree03518f79228089511f136a3f0a76f1849b291025
parentddaefcef96559edede929bdbd762f96911529718
parentaabc808ac541aee455239ea36c275bedf6e47ebc
Merge branch 'master' into harmattan
common-vars.pri