merge conflicts
authorsmita <smita@smita.apac.nokia.com>
Wed, 20 Jul 2011 08:46:58 +0000 (11:46 +0300)
committersmita <smita@smita.apac.nokia.com>
Wed, 20 Jul 2011 08:46:58 +0000 (11:46 +0300)
commit95f4a1a3f80195542649e49c7a7277241959e527
tree5f4cb39ad65e4f68570a3add30acea95ef1bf3d3
parent0d3ab0c3e99a3599bb7445811723d7608c89401d
parent503056f88fbfa63d20f1ff5b2dd73d1e7547d545
merge conflicts
lib/AccountsUI/account-settings-page.cpp