From: Éric Araujo <merwok@netwok.org>
Date: Tue, 26 Jul 2011 16:25:14 +0000 (+0200)
Subject: Branch merge.
X-Git-Tag: v3.2.2rc1~56^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e1af03fbb2a9fc1472ac866add02c99b0c88b16;p=thirdparty%2FPython%2Fcpython.git

Branch merge.

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

9e1af03fbb2a9fc1472ac866add02c99b0c88b16
diff --cc Misc/NEWS
index d91a9932054b,150b5f34106f..fd3b878da779
--- a/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
  -----