Branch merge.

I moved the NEWS entry for the reindent fix to the right release section.

diff --cc Misc/NEWS
index d91a9932054ba604f34629047957c4ff90891d71,150b5f34106fa70cb8fbca9353c4db7c1e97cc3a..fd3b878da779396b945deb5d2f7bb39337442372
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -108,6 -99,16 +99,21 @@@ Extension Module
  C-API
  -----
  
+ Build
+ -----
+ 
+ - Issue #12560: Build libpython.so on OpenBSD.  Patch by Stefan Sperling.
+ 
+ - Issue #12592: Make Python build on OpenBSD 5 (and future major releases).
+ 
+ - Issue #12372: POSIX semaphores are broken on AIX: don't use them.
+ 
++Tools/Demos
++-----------
++
++- Issue #10639: reindent.py no longer converts newlines and will raise
++  an error if attempting to convert a file with mixed newlines.
+ 
  Tests
  -----
  
@@@ -310,12 -311,6 +316,7 @@@ Buil
    "make install" creates symlinks in --prefix bin for the "-32" files in the
    framework bin directory like the installer does.
  
- Tools/Demos
- -----------
- 
- - Issue #10639: reindent.py no longer converts newlines and will raise
-   an error if attempting to convert a file with mixed newlines.
 +
  Tests
  -----