Merge with release clone.

diff --cc Misc/NEWS
index bd39f358b30e0be1f516e9fb38ee270f1d48473f,d847d4409fe103ee05cc3a321cca02c770ae5207..c12bda23a987a54fbea46efefd9ca833a2e5ca20
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,69 -2,6 +2,57 @@@
  Python News
  +++++++++++
  
- - Accept bytes for the AST string type. This is temporary until a proper fix in
-   3.3.
- 
 +What's New in Python 3.2.3?
 +===========================
 +
 +*Release date: XX-XXX-2011*
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #12802: the Windows error ERROR_DIRECTORY (numbered 267) is now
 +  mapped to POSIX errno ENOTDIR (previously EINVAL).
 +
- - Issue #10946: The distutils commands bdist_dumb, bdist_wininst and bdist_msi
-   now respect a --skip-build option given to bdist.
- 
 +- Issue #9200: The str.is* methods now work with strings that contain non-BMP
 +  characters even in narrow Unicode builds.
 +
 +- Issue #12791: Break reference cycles early when a generator exits with
 +  an exception.
 +
 +- Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase
 +  titlecased and cased non-letter characters.
 +
 +Library
 +-------
 +
 +- Issue #12878: Expose a __dict__ attribute on io.IOBase and its subclasses.
 +
 +- Issue #12636: IDLE reads the coding cookie when executing a Python script.
 +
- - Issue #12839: Fix crash in zlib module due to version mismatch.
-   Fix by Richard M. Tew.
- 
 +- Issue #12847: Fix a crash with negative PUT and LONG_BINPUT arguments in
 +  the C pickle implementation.
 +
 +- Issue #11564: Avoid crashes when trying to pickle huge objects or containers
 +  (more than 2**31 items).  Instead, in most cases, an OverflowError is raised.
 +
 +- Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is
 +  greater than FD_SETSIZE.
 +
- - Issue #12326: sys.platform is now always 'linux2' on Linux, even if Python
-   is compiled on Linux 3.
- 
 +- Issue #11657: Fix sending file descriptors over 255 over a multiprocessing
 +  Pipe.
 +
 +- Issue #12213: Fix a buffering bug with interleaved reads and writes that
 +  could appear on BufferedRandom streams.
 +
 +- Issue #12650: Fix a race condition where a subprocess.Popen could leak
 +  resources (FD/zombie) when killed at the wrong time.
 +
 +Tests
 +-----
 +
 +- Issue #12821: Fix test_fcntl failures on OpenBSD 5.
 +
 +
  What's New in Python 3.2.2?
  ===========================
  
@@@ -195,14 -163,6 +214,11 @@@ Librar
  Extension Modules
  -----------------
  
- - Issue #9651: Fix a crash when ctypes.create_string_buffer(0) was passed to
-   some functions like file.write().
- 
 +- Issue #12764: Fix a crash in ctypes when the name of a Structure field is not
 +  a string.
 +
 +- Issue #11241: subclasses of ctypes.Array can now be subclassed.
 +
  - 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.