merge forward, resolve conflicts. refs #5386

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/python-2.3-5386-4@37861 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb