merge conflicts
authorsmita <smita@smita.apac.nokia.com>
Thu, 28 Jul 2011 08:36:50 +0000 (11:36 +0300)
committersmita <smita@smita.apac.nokia.com>
Thu, 28 Jul 2011 08:36:50 +0000 (11:36 +0300)
commit097a2202232a8092721f1a6536d8e5bf1cc5b005
tree19fab217b368b8dbd3f98d871b151ffef4e23011
parent4e8059baf48d45e29a1e7b2b45438eac32b2dec2
parent7af5eef110d2d8ca3a277ad6ccb6eefebbf7a1e1
merge conflicts
lib/AccountsUI/credentialwidgetview.cpp