Merge with 3.3

diff --cc Misc/NEWS
index 602a5c7f0e6eb09f830dcdde3f65f7acc917523f,3092e323bffe2c5d9c4e4cd15d9d0dd21fe84b65..f5b56ef33dfea80e609191c03575cc2efa766a82
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -681,30 -509,27 +681,32 @@@ IDL
  Build
  -----
  
 -- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
 -  4.8.
 +- Issue #17845: Clarified the message printed when some module are not built.
  
 -- Issue #17962: Build with OpenSSL 1.0.1e on Windows.
 +- Issue #18256: Compilation fix for recent AIX releases.  Patch by
 +  David Edelsohn.
  
 +- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
 +  4.8.
  
 -What's New in Python 3.3.1?
 -===========================
 +- Issue #15172: Document NASM 2.10+ as requirement for building OpenSSL 1.0.1
 +  on Windows.
  
 -*Release date: 07-Apr-2013*
 +Tools/Demos
 +-----------
  
 -Build
 ------
++- Issue #18439: Make patchcheck work on Windows for ACKS, NEWS.
+ 
 -- Issue #17550: Fix the --enable-profiling configure switch.
 +- Issue #18448: Fix a typo in Tools/demo/eiffel.py.
  
 -IDLE
 --------
 +- Issue #18457: Fixed saving of formulas and complex numbers in
 +  Tools/demo/ss1.py.
  
 -- Issue #17625: In IDLE, close the replace dialog after it is used.
 +- Issue #18449: Make Tools/demo/ss1.py work again on Python 3.  Patch by
 +  Févry Thibault.
  
 +- Issue #12990: The "Python Launcher" on OSX could not launch python scripts
 +  that have paths that include wide characters.
  
  What's New in Python 3.3.1 release candidate 1?
  ===============================================