Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Wed, 15 Feb 2012 04:36:38 +0000 (06:36 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Wed, 15 Feb 2012 04:36:38 +0000 (06:36 +0200)
commita3b45829df1b075717764b546908659b1654763d
tree49ffe8cee6434fb4cd9d27d8e1c4b9abb870c12c
parent1099d581d4523010c5e85b3616e526c5d7b96cf5
parent0366aec73983a9f0564872c7450331f9a68fa304
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri