Blocked revisions 85078,87839 via svnmerge

Blocked revisions 85078,87839 via svnmerge

87839 turns out to have been a py3k regression; 2.x doesn't have the bug.

........
  r85078 | r.david.murray | 2010-09-28 18:25:18 -0400 (Tue, 28 Sep 2010) | 2 lines

  #9628: fix runtests.sh -x option so more than one test can be excluded.
........
  r87839 | r.david.murray | 2011-01-07 16:57:25 -0500 (Fri, 07 Jan 2011) | 9 lines

  Fix formatting of values with embedded newlines when rfc2047 encoding

  Before this patch if a value being encoded had an embedded newline,
  the line following the newline would have no leading whitespace,
  and the whitespace it did have was encoded into the word.  Now
  the existing whitespace gets turned into a blank, the way it does
  in other header reformatting, and the _continuation_ws gets added
  at the beginning of the encoded line.
........