[Python-checkins] cpython (3.2): Fix-up NEWS merge.

[georg.brandl]

http://hg.python.org/cpython/rev/c49474f7f986
changeset:   72243:c49474f7f986
branch:      3.2
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 03 09:08:49 2011 +0200
summary:
  Fix-up NEWS merge.

files:
  Misc/NEWS |  10 ++++++----
  1 files changed, 6 insertions(+), 4 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,13 +13,18 @@
 - 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 @@
 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.

-- 
Repository URL: http://hg.python.org/cpython