Merge branch 'account-service-impl' into harmattan_rama_qt
authorRamakrishna <ranarasi@TimmanaMane.noe.nokia.com>
Mon, 25 Apr 2011 13:54:26 +0000 (19:24 +0530)
committerRamakrishna <ranarasi@TimmanaMane.noe.nokia.com>
Mon, 25 Apr 2011 13:54:26 +0000 (19:24 +0530)
commit048ee0663469337fee6206341151db0f46bb427f
treedc368db8c5ee0624d27ff38cf9afb08524b82c27
parentd2d79245cdc2cdd4207a6f1a851e905c66bff24b
parent18f2d7c0aaf2ed45cadaa03a6e29fb697332536b
Merge branch 'account-service-impl' into harmattan_rama_qt

Conflicts:
Accounts/manager.h
Accounts/account-service.cpp
Accounts/account-service.h
tests/accountstest.cpp
tests/accountstest.h
tests/tests.xml