Merge from 3.2

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index e5eed118c063bb29e2d53aea15edfcef232abee5,b012d28467a1c719e2d57c78185f21f08e2d37df..879dc03cce2b0c8999992641a4da2107e5656ea5
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -116,66 -75,6 +116,69 @@@ Librar
    a multiprocessing Client or Listener with an AF_PIPE type address under
    non-Windows platforms.  Patch by Popa Claudiu.
  
 +- Issue #14493: Use gvfs-open or xdg-open in webbrowser.
 +
 +Tests
 +-----
 +
++- Issue #14032: Fix incorrect variable name in test_cmd_line_script debugging
++  message (Patch by Jason Yeo)
++
 +- Issue #14589: Update certificate chain for sha256.tbs-internet.com, fixing
 +  a test failure in test_ssl.
 +
 +- Issue #14355: Regrtest now supports the standard unittest test loading, and
 +  will use it if a test file contains no `test_main` method.
 +
 +Tools / Demos
 +-------------
 +
 +- Issue #13165: stringbench is now available in the Tools/stringbench folder.
 +  It used to live in its own SVN project.
 +
 +
 +What's New in Python 3.3.0 Alpha 2?
 +===================================
 +
 +*Release date: 01-Apr-2012*
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #1683368: object.__new__ and object.__init__ raise a TypeError if they
 +  are passed arguments and their complementary method is not overridden.
 +
 +- Issue #14378: Fix compiling ast.ImportFrom nodes with a "__future__" string as
 +  the module name that was not interned.
 +
 +- Issue #14331: Use significantly less stack space when importing modules by
 +  allocating path buffers on the heap instead of the stack.
 +
 +- Issue #14334: Prevent in a segfault in type.__getattribute__ when it was not
 +  passed strings.
 +
 +- Issue #1469629: Allow cycles through an object's __dict__ slot to be
 +  collected. (For example if ``x.__dict__ is x``).
 +
 +- Issue #14205: dict lookup raises a RuntimeError if the dict is modified
 +  during a lookup.
 +
 +- Issue #14220: When a generator is delegating to another iterator with the
 +  yield from syntax, it needs to have its ``gi_running`` flag set to True.
 +
 +- Issue #14435: Remove dedicated block allocator from floatobject.c and rely
 +  on the PyObject_Malloc() api like all other objects.
 +
 +- Issue #14471: Fix a possible buffer overrun in the winreg module.
 +
 +- Issue #14288: Allow the serialization of builtin iterators
 +
 +Library
 +-------
 +
 +- Issue #14300: Under Windows, sockets created using socket.dup() now allow
 +  overlapped I/O.  Patch by sbt.
 +
  - Issue #13872: socket.detach() now marks the socket closed (as mirrored
    in the socket repr()).  Patch by Matt Joiner.