From: Éric Araujo <merwok@netwok.org>
Date: Tue, 30 Aug 2011 14:05:31 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~1600^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=caa745e7ca238313293de8cfe183df3d92f18cc9;p=python

Branch merge
---

caa745e7ca238313293de8cfe183df3d92f18cc9
diff --cc Misc/NEWS
index 68caece095,c97a5a56f1..35343faaf8
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -22,12 -22,9 +22,15 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #10946: The distutils commands bdist_dumb, bdist_wininst and bdist_msi
+   now respect a --skip-build option given to bdist.
+ 
 +- Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in
 +  the C pickle implementation.
 +
 +- Issue #11564: Avoid crashes when trying to pickle huge objects or containers
 +  (more than 2**31 items).  Instead, in most cases, an OverflowError is raised.
 +
  - Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is
    greater than FD_SETSIZE.