Merge branch 'harmattan' of gitorious.org:accounts-sso/libaccounts-ui into harmattan harmattan/0.63-1
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Mon, 31 Jan 2011 10:43:11 +0000 (12:43 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Mon, 31 Jan 2011 10:43:11 +0000 (12:43 +0200)
commit58b945274a70f72bdccca003c62302c767f7b63e
tree72934756146121b2d60c6dc5cf54e17db3971fa2
parent4997b56dae210f2ece660ed3456c265e54cad323
parente31cd53fce02abd8c2dd11a156e7ac7353a347bb
Merge branch 'harmattan' of gitorious.org:accounts-sso/libaccounts-ui into harmattan

Conflicts:
debian/changelog
debian/changelog