From: Georg Brandl <georg@python.org>
Date: Sat, 3 Sep 2011 07:08:49 +0000 (+0200)
Subject: Fix-up NEWS merge.
X-Git-Tag: v3.2.2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89b7af1e532f4a12632e77173e71717f2e9996e8;p=thirdparty%2FPython%2Fcpython.git

Fix-up NEWS merge.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index af26b8dcfa42..0aa9a113147a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,13 +13,18 @@ Core and Builtins
 - Issue #12326: sys.platform is now always 'linux2' on Linux, even if Python
   is compiled on Linux 3.
 
-
 Library
 -------
 
 - Issue #12839: Fix crash in zlib module due to version mismatch.
   Fix by Richard M. Tew.
 
+Extension Modules
+-----------------
+
+- Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to
+  some functions like file.write().
+
 
 
 What's New in Python 3.2.2 release candidate 1?
@@ -152,9 +157,6 @@ Library
 Extension Modules
 -----------------
 
-- Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to
-  some functions like file.write().
-
 - Issue #10309: Define _GNU_SOURCE so that mremap() gets the proper
   signature.  Without this, architectures where sizeof void* != sizeof int are
   broken.  Patch given by Hallvard B Furuseth.