Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 3 Dec 2010 09:59:27 +0000 (11:59 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 3 Dec 2010 09:59:27 +0000 (11:59 +0200)
commit2f88acba679dcedfb4a75a80b07af4e50f0d24f8
tree002703f06adf34f5f2fdd3ee79c3e904670412c2
parent311b6cac8e97fae578e5387cfff6592a2c099feb
parent158cc01d77029088f39c20b9a7d6102525de9449
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri
lib/AccountsUI/provider-plugin-proxy.cpp
lib/AccountsUI/provider-plugin-proxy.cpp