From: Éric Araujo <merwok@netwok.org>
Date: Tue, 30 Aug 2011 14:21:15 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~1601
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d15b768ddb68fe82470d26bb2cc36699f4bc0b75;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

d15b768ddb68fe82470d26bb2cc36699f4bc0b75
diff --cc Misc/NEWS
index 93ee402edd5d,d08d94ec6966..fc9d65c57af9
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -268,12 -268,10 +268,16 @@@ 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.  The packaging commands
+   were fixed too.
+ 
 +- 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.