merge with 3.3.1 release clone

diff --cc .hgtags
Simple merge

diff --cc Doc/library/concurrent.futures.rst
Simple merge

diff --cc Lib/idlelib/NEWS.txt
Simple merge

diff --cc Misc/NEWS
index 6014d2e14f0a34cdaa0973909d1d926a2d0ccd67,59308583949af976edf627590bcf6fc7efca0c52..ad86c401def2341e0bb75f8307bfc3f97a1e4006
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,58 -2,29 +2,74 @@@
  Python News
  +++++++++++
  
- *Release date: XXXX-XX-XX*
 +What's New in Python 3.3.2?
 +===========================
 +
- *Not yet released, see sections below for changes released in 3.3.0*
++.. *Release date: XXXX-XX-XX*
 +
++*Not yet released, see sections below for changes released in 3.3.1*
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #17619: Make input() check for Ctrl-C correctly on Windows.
 +
 +- Issue #17610: Don't rely on non-standard behavior of the C qsort() function.
 +
 +- Issue #17357: Add missing verbosity output when using -v/-vv.
 +
 +Library
 +-------
 +
 +- Issue #17572: Avoid chained exceptions while passing bad directives to
 +  time.strptime().  Initial patch by Claudiu Popa.
 +
 +- Issue #17625: In IDLE, close the replace dialog after it is used.
 +
 +- Issue #14254: IDLE now handles readline correctly across shell restarts.
 +
 +- Issue #17614: IDLE no longer raises exception when quickly closing a file.
 +
 +- Issue #6698: IDLE now opens just an editor window when configured to do so.
 +
 +- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer
 +  raises an exception.
 +
 +- Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo.
 +
 +- Issue #17435: threading.Timer's __init__ method no longer uses mutable
 +  default values for the args and kwargs parameters.
 +
 +- Issue #17526: fix an IndexError raised while passing code without filename to
 +  inspect.findsource().  Initial patch by Tyler Doyle.
 +
 +Documentation
 +-------------
 +
 +- Issue #15940: Specify effect of locale on time functions.
 +
 +
  What's New in Python 3.3.1?
  ===========================
  
  *Release date: 07-Apr-2013*
  
 -.. *Not yet released, see sections below for changes released in 3.3.0*
 -
+ Build
+ -----
+ 
+ - Issue #17550: Fix the --enable-profiling configure switch.
+ 
+ Library
+ -------
+ 
+ - Issue #17625: In IDLE, close the replace dialog after it is used.
+ 
+ 
+ What's New in Python 3.3.1 release candidate 1?
+ ===============================================
+ 
+ *Release date: 24-Mar-2013*
+ 
  Core and Builtins
  -----------------
  

diff --cc README
Simple merge