Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 12 Dec 2011 13:34:19 +0000 (15:34 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Mon, 12 Dec 2011 13:34:19 +0000 (15:34 +0200)
commitec6a2d5c7add36f2b7ea63e708d000e4172d378e
tree8bc11a45cc91d5402170bd9802e0ef03e8e4197a
parent0b4c8daf2618f05074a7072576289354a708ce92
parentc4324ecee2798d380c60e86d00d5ed8a1df24726
Merge branch 'master' into harmattan
common-vars.pri