address erstwhile merge conflicts

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/serialports-endpoint-4847-4@43467 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb