Merge branch '2'
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Mon, 29 Nov 2010 15:54:27 +0000 (17:54 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Mon, 29 Nov 2010 15:54:27 +0000 (17:54 +0200)
commitb398edcc741d7fc6695f4f86686e3743bf20117e
tree9719989bfe0a88cd46c1ad59bdf0a080a4c20257
parent6aa0e47f49a0253972132eb3e5230adad848a910
parent8f83f4deb3b04af874a34517af96a65c12f8777b
Merge branch '2'
lib/AccountsUI/add-account-page.cpp
lib/AccountsUI/add-account-page.h