Merging patch from adiroiban

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/servid-error-7355@43023 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb