apply 1601v2.patch refs #1601

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/ugly-usage-wrapping-1601@38132 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb