From 89b7af1e532f4a12632e77173e71717f2e9996e8 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 3 Sep 2011 09:08:49 +0200
Subject: [PATCH] Fix-up NEWS merge.

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

diff --git a/Misc/NEWS b/Misc/NEWS
index af26b8dcfa4..0aa9a113147 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.