Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 15 Dec 2010 09:59:51 +0000 (11:59 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 15 Dec 2010 09:59:51 +0000 (11:59 +0200)
commit09769ff797e5e3a72bcc2a2caef8adcef8835063
treee5f4d33c3f68ac0701a39497bd9f2fac3aec4f9a
parentf06af1dd6795a098335cf2fa0ac38b3f3036abb1
parent641a2a5dc6bd5274d96412157e1ca955cde78be8
Merge branch 'master' into harmattan

Conflicts:

lib/AccountsUI/provider-plugin-proxy.cpp