Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Thu, 12 Jan 2012 09:53:34 +0000 (11:53 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Thu, 12 Jan 2012 09:53:34 +0000 (11:53 +0200)
commitcb03ce30515f323bba911d5bc291c23839e243f9
tree3471ee8ce4daf3f1e421f21ada229585d7857f84
parent4d154afec45fbac1ff76ba9b74ee4a8c55d8d997
parent79e37aa2bba85fad08900cfdc7e0f844aabffb9d
Merge branch 'master' into harmattan
common-vars.pri