Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 18 Jan 2011 13:51:58 +0000 (15:51 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 18 Jan 2011 13:51:58 +0000 (15:51 +0200)
commitafdbad7e243eb5f0aab8f2aae40b0b48f28a8646
treefcb0f87dc3f4872cc28a6241ffa141bb1042b671
parent878b2b03503b78e3f04b9f9b06935ebda092d524
parentf9301679cd2698036cda3ef62e246d5430c174e5
Merge branch 'master' into harmattan

Conflicts:

common-vars.pri