Avoid using SubHandlingValue object inside XCAPManager

Ignore-this: de904ca13dc2b9ac00f7472d946079ef

darcs-hash:20100922151345-56b4d-ab96af42026963583c516d575f23b49f36eb8d18
Fixed contact edit in XCAPManager when it needs to be removed and readded

Ignore-this: 5378439d28884f26ff3af7fb4c9664f2

darcs-hash:20100923121533-56b4d-55f71c1478bc19c8f55c52fffa414ba33875ef0a