Merge branch 'master' into harmattan
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Sat, 13 Nov 2010 21:21:13 +0000 (23:21 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Sat, 13 Nov 2010 21:21:13 +0000 (23:21 +0200)
commit8b7e51f86b7f89f8dad8e5b376b1e16954da7f82
tree813fea6e31368e241c7272ada53be64dc85cae6c
parentc455088ca00e6da08d68c40c4fc903b7f0867823
parent4e83162f502882fef25df5ae952aefdfc51b4582
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri
lib/AccountsUI/accountsettingspage.cpp
lib/AccountsUI/settings-page.cpp
lib/AccountsUI/service-settings-widget.h