Merge conflicts
authorsmita <smita@smita-laptop.(none)>
Mon, 1 Nov 2010 09:08:52 +0000 (11:08 +0200)
committersmita <smita@smita-laptop.(none)>
Mon, 1 Nov 2010 09:08:52 +0000 (11:08 +0200)
commitd5358d9ee5e1acd1ac6e9c8a89ac12dcad17aabf
tree4eec7f9750176fd4be54ad41b7372f788ca3cb6a
parent9823f3f2179e2c7a6e721d411cfcc146aab37cc7
Merge conflicts
lib/AccountsUI/accountsettingspage.cpp
lib/AccountsUI/service-selection-page.cpp
lib/AccountsUI/service-settings-widget.cpp
lib/AccountsUI/service-settings-widget.h