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 bc48622..17fb072 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -833,6 +833,8 @@
 
 Library
 -------
+- Issue #1555570: email no longer inserts extra blank lines when a \r\n
+  combo crosses an 8192 byte boundary.
 
 - Issue #6906: Tk should not set Unicode environment variables on Windows.