Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 13 Jan 2011 08:02:25 +0000 (10:02 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 13 Jan 2011 08:02:25 +0000 (10:02 +0200)
commit6403a768a88306293d0fda668f5467946b064be8
tree4072f67dfad5b6b56cd1806fc5e147dfc5b0be96
parent37ae786f6588ebec319602f8f95cdfe46545848f
parent80a6239e48d03df9d4d646dbbd0bed5e66fe8a7f
Merge branch 'master' into harmattan

Conflicts:

common-vars.pri