Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Thu, 7 Jul 2011 13:50:58 +0000 (16:50 +0300)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Thu, 7 Jul 2011 13:50:58 +0000 (16:50 +0300)
commitd41dcb8d86b0ae9f8a83ab4b5c7809b41f323c0b
tree390f38b5fc35dd7c74afd7ed41075166c2e29fbb
parentf67128fae070138dad11c5b208d63b1b163a7624
parent503056f88fbfa63d20f1ff5b2dd73d1e7547d545
Merge branch 'master' into harmattan

Conflicts:
lib/AccountsUI/settings-page.cpp
lib/AccountsUI/service-settings-widget.cpp
lib/AccountsUI/settings-page.cpp