Merged revisions 76798-76799 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76798 | benjamin.peterson | 2009-12-13 11:29:16 -0600 (Sun, 13 Dec 2009) | 1 line

  make StringIO like other file objects in that readline(-1) has no effect #7348
........
  r76799 | benjamin.peterson | 2009-12-13 11:31:31 -0600 (Sun, 13 Dec 2009) | 1 line

  add NEWS note
........
diff --git a/Misc/NEWS b/Misc/NEWS
index d9cb038..a933f62 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -35,6 +35,9 @@
 Library
 -------
 
+- Issue #7348: StringIO.StringIO.readline(-1) now acts as if it got no argument
+  like other file objects.
+
 - Issue #5949: fixed IMAP4_SSL hang when the IMAP server response is
   missing proper end-of-line termination.