merge 3.2

diff --cc Misc/NEWS
index aefdb8b6e8356628f8140cbab0d34a8e3d5ef52a,d763e0fc2967c01a47633fdcd169f372a93c812f..ec795685bb26117e6e620b920317eba769e1022e
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -11,29 -11,27 +11,29 @@@ Core and Builtin
  -----------------
  
  - Issue #12475: Prevent generators from leaking their exception state into the
-   callers frame as they return for the last time.
+   caller's frame as they return for the last time.
  
 -Library
 --------
 +- Issue #12291: You can now load multiple marshalled objects from a stream,
 +  with other data interleaved between marshalled objects.
  
 -C-API
 ------
 +- Issue #12356: When required positional or keyword-only arguments are not
 +  given, produce a informative error message which includes the name(s) of the
 +  missing arguments.
  
 -What's New in Python 3.2.1 release candidate 2?
 -===============================================
 +- Issue #12370: Fix super with not arguments when __class__ is overriden in the
 +  class body.
  
 -*Release date: XX-XXX-2011*
 +- Issue #12084: os.stat on Windows now works properly with relative symbolic
 +  links when called from any directory.
  
 -Core and Builtins
 ------------------
 +- Loosen type restrictions on the __dir__ method. __dir__ can now return any
 +  sequence, which will be converted to a list and sorted by dir().
  
 -- Issue #12291: You can now load multiple marshalled objects from a stream,
 -  with other data interleaved between marshalled objects.
 +- Issue #12265: Make error messages produced by passing an invalid set of
 +  arguments to a function more informative.
  
 -- Issue #12084: os.stat on Windows now works properly with relative symbolic
 -  links when called from any directory.
 +- Issue #12225: Still allow Python to build if Python is not in its hg repo or
 +  mercurial is not installed.
  
  - Issue #1195: my_fgets() now always clears errors before calling fgets(). Fix
    the following case: sys.stdin.read() stopped with CTRL+d (end of file),