Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 20 Oct 2010 13:32:36 +0000 (16:32 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 20 Oct 2010 13:32:36 +0000 (16:32 +0300)
commitd88d1d2ab7f90057f5bc7b64cf7aa7a1a7655c29
treebdc1c750c900c33224cdea21304218d0eb083a8b
parent49e27bddad5b79fd5476ee3aadf23fed65e8bb2d
parent53013807a7715920a9c98abd64e4ca3e3a329c48
Merge branch 'master' into harmattan

Conflicts:

common-vars.pri
lib/AccountsUI/accountsettingspage.cpp