From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sun, 8 May 2011 17:01:36 +0000 (+0300)
Subject: Merge with 3.2.
X-Git-Tag: v3.3.0a1~2359
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43432b84c3b96cf911f99ba862f63f6172a4f494;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.2.
---

43432b84c3b96cf911f99ba862f63f6172a4f494
diff --cc Misc/NEWS
index ef78ab7cf955,c5f78e768610..c780f3d00f3d
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -152,10 -88,7 +152,10 @@@ Librar
  
  - 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.