Branch merge

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index 7c481990916d0b1c6e6747df087e0d11b8596f71,47f3b0e7aa7754c0b926e8a930040afc5397648b..5b3a372dd55006671f453d9b9838ee27c0db2a7f
--- 1/Misc/NEWS
--- 2/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.