Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Wed, 9 Nov 2011 07:27:51 +0000 (09:27 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Wed, 9 Nov 2011 07:27:51 +0000 (09:27 +0200)
commitab8191d0a61b975a6e3b53c36fa741f5132a1dbe
tree72eb9c9c5ffd364cb5290fe123f71d9f22fed7af
parent079a619beeb91ef889d5a397a857a640d41ca1a5
parent997b3c27505164fadc1674a008d50073e948fdc8
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri