[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/3bb8c44996c1
changeset:   69939:3bb8c44996c1
parent:      69936:e3cb2c99a5a9
parent:      69938:c3bd98e1318b
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun May 08 20:01:36 2011 +0300
summary:
  Merge with 3.2.

files:
  Misc/NEWS |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -152,10 +152,10 @@
 
 - Issue #12002: ftplib's abort() method raises TypeError.
 
-- Issue 11916: Add a number of MacOSX specific definitions to the errno module.
+- Issue #11916: Add a number of MacOSX specific definitions to the errno module.
   Patch by Pierre Carrier.
 
-- Issue 11999: fixed sporadic sync failure mailbox.Maildir due to its trying to
+- Issue #11999: fixed sporadic sync failure mailbox.Maildir due to its trying to
   detect mtime changes by comparing to the system clock instead of to the
   previous value of the mtime.
 

-- 
Repository URL: http://hg.python.org/cpython