Merge in changes from 3.2.1b1 release repo.

diff --cc Misc/NEWS
index 6b0a6b50f8368c585a0a56a9248bcc00e25180cf,4b20d44d315feae5bdd00555cac8a3888783e83c..dfde0b2617adb6175b01493a62ef275ed0cc3550
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,16 -10,9 +10,16 @@@ What's New in Python 3.2.1 beta 1
  Core and Builtins
  -----------------
  
 +- Issue #12044: Fixed subprocess.Popen when used as a context manager to
 +  wait for the process to end when exiting the context to avoid unintentionally
 +  leaving zombie processes around.
 +
 +- Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c,
 +  clear the end-of-file indicator after CTRL+d.
 +
  - Issue #1856: Avoid crashes and lockups when daemon threads run while the
-   interpreter is shutting down; instead, these threads are now killed when
-   they try to take the GIL.
+   interpreter is shutting down; instead, these threads are now killed when they
+   try to take the GIL.
  
  - Issue #9756: When calling a method descriptor or a slot wrapper descriptor,
    the check of the object type doesn't read the __class__ attribute anymore.
@@@ -90,30 -83,8 +90,30 @@@
  Library
  -------
  
- - Issue #11927: SMTP_SSL now uses port 465 by default as documented.  Patch
-   by Kasun Herath.
 +- Issue #12062: Fix a flushing bug when doing a certain type of I/O sequence
 +  on a file opened in read+write mode (namely: reading, seeking a bit forward,
 +  writing, then seeking before the previous write but still within buffered
 +  data, and writing again).
 +
 +- Issue #1028: Tk returns invalid Unicode null in %A: UnicodeDecodeError.
 +  With Tk < 8.5 _tkinter.c:PythonCmd() raised UnicodeDecodeError, caused
 +  IDLE to exit.  Converted to valid Unicode null in PythonCmd().
 +
 +- Issue #11169: compileall module uses repr() to format filenames and paths to
 +  escape surrogate characters and show spaces.
 +
 +- Issue #10419, #6011: build_scripts command of distutils handles correctly
 +  non-ASCII path (path to the Python executable). Open and write the script in
 +  binary mode, but ensure that the shebang is decodable from UTF-8 and from the
 +  encoding of the script.
 +
 +- Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in
 +  order to accept exactly one connection.  Patch by Daniel Evers.
 +
 +- Issue #11164: Stop trying to use _xmlplus in the xml module.
 +
+ - Issue #11927: SMTP_SSL now uses port 465 by default as documented.  Patch by
+   Kasun Herath.
  
  - Issue #12002: ftplib's abort() method raises TypeError.
  
@@@ -342,12 -314,10 +343,12 @@@
  Build
  -----
  
 +- Issue #11347: Use --no-as-needed when linking libpython3.so.
 +
  - Issue #11411: Fix 'make DESTDIR=' with a relative destination.
  
- - Issue #11268: Prevent Mac OS X Installer failure if Documentation
-   package had previously been installed.
+ - Issue #11268: Prevent Mac OS X Installer failure if Documentation package had
+   previously been installed.
  
  IDLE
  ----