Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 5 Apr 2011 06:39:53 +0000 (09:39 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 5 Apr 2011 06:39:53 +0000 (09:39 +0300)
commit87abbd4c429c16fda8f3a072e0015acc8c4301b7
tree9672a36d21413a7926fb92cc280cf4d889ad388b
parent5253a65e3d66aa839f2449b63aef6400eb682f4a
parent654d3d1d2d7b6fe9f4b9fe8ebdc25513f4b14c02
Merge branch 'master' into harmattan

Conflicts:

common-vars.pri
lib/AccountsUI/account-settings-page.cpp
lib/AccountsUI/service-settings-widget.h