Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 14 Dec 2010 08:05:52 +0000 (10:05 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 14 Dec 2010 08:05:52 +0000 (10:05 +0200)
commit187b4a14a2a8184b5b9af56c8e3f247b9d1062c3
tree80ad88a3e3a88ce329c2e82204c2f8c1ddeb3aa4
parentd6ef5a3e79e8cf2b5406d500d2b962b66128d78e
parentedcd8506fabf18079d9856d750eb44dad47c85bc
Merge branch 'master' into harmattan

Conflicts:

common-vars.pri
lib/AccountsUI/service-selection-page.cpp