Merged in xmlrpc_proxy-1895@20753 to trunk@20653 for inclusion in
knoboo.external.twisted
