Merged revisions 82924 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r82924 | r.david.murray | 2010-07-16 21:35:16 -0400 (Fri, 16 Jul 2010) | 11 lines

  Merged revisions 82922 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r82922 | r.david.murray | 2010-07-16 21:19:57 -0400 (Fri, 16 Jul 2010) | 4 lines

    #1555570: correctly handle a \r\n that is split by the read buffer.

    Patch and test by Tony Nelson.
  ........
................
diff --git a/Misc/NEWS b/Misc/NEWS
index fdd9a42..0688d0b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -81,6 +81,9 @@
 Library
 -------
 
+- Issue #1555570: email no longer inserts extra blank lines when a \r\n
+  combo crosses an 8192 byte boundary.
+
 - Issue #9164: Ensure sysconfig handles dupblice archs while building on OSX
 
 - Issue #7646: The fnmatch pattern cache no longer grows without bound.