Does the original author, or anyone else, want to deal with the trivial review feedback on this ticket and get it to trunk? It's blocking an important bugfix release; <http://twistedmatrix.com/trac/ticket/6245> -glyph