merge 3.2

diff --cc Misc/NEWS
index 0e55a24a5fea406110cdff22d8848c603ad35798,bfae292e2ac80ea3095e4066ae7def3771cb5a6e..06fcf2a589cce2abf38f2fc38304287fded2ef3f
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,21 -10,10 +10,21 @@@ What's New in Python 3.3.0 Alpha 3
  Core and Builtins
  -----------------
  
 +- Issue #12599: Be more strict in accepting None compared to a false-like
 +  object for importlib.util.module_for_loader and
 +  importlib.machinery.PathFinder.
 +
  - Issue #14612: Fix jumping around with blocks by setting f_lineno.
  
- - Issue #14607: Fix defaults keyword-only arguments which started with ``__``.
 +- Issue #14592: Attempting a relative import w/o __package__ or __name__ set in
 +  globals raises a KeyError.
 +
+ - Issue #14607: Fix keyword-only arguments which started with ``__``.
  
 +- Issue #10854: The ImportError raised when an extension module on Windows
 +  fails to import now uses the new path and name attributes from
 +  Issue #1559549.
 +
  - Issue #13889: Check and (if necessary) set FPU control word before calling
    any of the dtoa.c string <-> float conversion functions, on MSVC builds of
    Python.  This fixes issues when embedding Python in a Delphi app.