Log Message: Remove extra, asymetric context from last hunk; it was confusing GNU patch. Problem pointed out by Georg Schwarz on tech-pkg.