From: Éric Araujo <merwok@netwok.org>
Date: Sat, 11 Jun 2011 17:56:09 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~2129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc18532eee4098bd57805d021b53fba618428d15;p=python

Branch merge
---

bc18532eee4098bd57805d021b53fba618428d15
diff --cc Misc/NEWS
index 7c48199091,47f3b0e7aa..5b3a372dd5
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -187,11 -187,13 +187,18 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #12240: Allow multiple setup hooks in packaging's setup.cfg files.
+   Original patch by Erik Bray.
+ 
+ - Issue #11595: Fix assorted bugs in packaging.util.cfg_to_args, a
+   compatibility helper for the distutils-packaging transition.  Original patch
+   by Erik Bray.
+ 
 +- Issue #12287: In ossaudiodev, check that the device isn't closed in several
 +  methods.
 +
 +- Issue #12009: Fixed regression in netrc file comment handling.
 +
  - Issue #12246: Warn and fail when trying to install a third-party project from
    an uninstalled Python (built in a source checkout).  Original patch by
    Tshepang Lekhonkhobe.