merge 3.3 (#17547)

diff --cc Misc/NEWS
index bbf694395cd80f30f10e680321206e5f43eb6a9c,c74107622a5a876f5118515f30e8a3f4f9789bb2..22e038b51e976f5180b972c8558be8f506a34827
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -283,23 -218,33 +283,29 @@@ Test
  - Issue #6696: add documentation for the Profile objects, and improve
    profile/cProfile docs.  Patch by Tom Pinckney.
  
 -Build
 +C-API
  -----
  
 -- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
 -  4.8.
 +- Issue #17522: Add the PyGILState_Check() API.
  
 +- Issue #17327: Add PyDict_SetDefault.
  
 -What's New in Python 3.3.1?
 -===========================
  
 -*Release date: 07-Apr-2013*
 +IDLE
 +----
  
 -Build
 ------
 +- Issue #13495: Avoid loading the color delegator twice in IDLE.
  
 -- Issue #17550: Fix the --enable-profiling configure switch.
 +- Issue #17798: Allow IDLE to edit new files when specified on command line.
  
 -IDLE
 --------
 +- Issue #14735: Update IDLE docs to omit "Control-z on Windows".
  
 -- Issue #17625: In IDLE, close the replace dialog after it is used.
++Build
++-----
++
++- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
++  4.8.
+ 
  
  What's New in Python 3.3.1 release candidate 1?
  ===============================================

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge