Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Tue, 14 Jun 2011 14:12:34 +0000 (17:12 +0300)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Tue, 14 Jun 2011 14:12:34 +0000 (17:12 +0300)
commita0ee34a7e856797597103c99f5af7ed3a3749744
tree2571a20a88c4ef0689675a1cb4194a9a9282a580
parentd2d79245cdc2cdd4207a6f1a851e905c66bff24b
parentb1c528b684d2b1cd5d8977cdb117eedeafa17399
Merge branch 'master' into harmattan

Conflicts:
Accounts/account.h
common-vars.pri