merge with 3.2

diff --cc Misc/NEWS
index a2da8e03d0dafdeed287a2201946651a64287986,7662a43ae4e77599294545e170f804c72f136e79..251651c222d6e6239a61e89b9741e4cd3cd0f277
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -49,26 -10,9 +49,32 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #17192: Restore the patch for Issue #11729 and Issue #10309
 -  which were omitted in 3.2.4 when updating the bundled version of
 -  libffi used by ctypes.
++- Issue #1159051: Back out a fix for handling corrupted gzip files that
++  broke backwards compatibility.
++
++- Issue #17915: Fix interoperability of xml.sax with file objects returned by
++  codecs.open().
++
 +- Issue #16601: Restarting iteration over tarfile no more continues from where
 +  it left off.  Patch by Michael Birtwell.
 +
 +- Issue #17289: The readline module now plays nicer with external modules
 +  or applications changing the rl_completer_word_break_characters global
 +  variable.  Initial patch by Bradley Froehle.
 +
 +- Issue #12181: select module: Fix struct kevent definition on OpenBSD 64-bit
 +  platforms. Patch by Federico Schwindt.
 +
 +- Issue #14173: Avoid crashing when reading a signal handler during
 +  interpreter shutdown.
 +
 +- Issue #16316: mimetypes now recognizes the .xz and .txz (.tar.xz) extensions.
 +
 +- Issue #15902: Fix imp.load_module() accepting None as a file when loading an
 +  extension module.
 +
 +- Issue #17802: Fix an UnboundLocalError in html.parser.  Initial tests by
 +  Thomas Barlow.
  
  - Issue #15535: Fix namedtuple pickles which were picking up the OrderedDict
    instead of just the underlying tuple.
@@@ -182,57 -29,11 +188,60 @@@ IDL
  Tests
  -----
  
 +- Issue #17833: Fix test_gdb failures seen on machines where debug symbols
 +  for glibc are available (seen on PPC64 Linux).
 +
 +- Issue #7855: Add tests for ctypes/winreg for issues found in IronPython.
 +  Initial patch by Dino Viehland.
 +
 +- Issue #17712: Fix test_gdb failures on Ubuntu 13.04.
 +
 +- Issue #17835: Fix test_io when the default OS pipe buffer size is larger
 +  than one million bytes.
 +
 +- Issue #17065: Use process-unique key for winreg tests to avoid failures if
 +  test is run multiple times in parallel (eg: on a buildbot host).
 +
 +- Issue #12820: add tests for the xml.dom.minicompat module.
 +  Patch by John Chandler and Phil Connell.
 +
 +- Issue #17790: test_set now works with unittest test discovery.
 +  Patch by Zachary Ware.
 +
 +- Issue #17789: test_random now works with unittest test discovery.
 +  Patch by Zachary Ware.
 +
 +- Issue #17779: test_osx_env now works with unittest test discovery.
 +  Patch by Zachary Ware.
 +
 +- Issue #17766: test_iterlen now works with unittest test discovery.
 +  Patch by Zachary Ware.
 +
 +- Issue #17690: test_time now works with unittest test discovery.
 +  Patch by Zachary Ware.
 +
 +- Issue #17692: test_sqlite now works with unittest test discovery.
 +  Patch by Zachary Ware.
 +
+ - Issue #17843: Removed bz2 test data file that was triggering false-positive
+   virus warnings with certain antivirus software.
+ 
 +Documentation
 +-------------
 +
 +- Issue #15940: Specify effect of locale on time functions.
 +
 +- Issue #6696: add documentation for the Profile objects, and improve
 +  profile/cProfile docs.  Patch by Tom Pinckney.
 +
 +Build
 +-----
 +
 +- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
 +  4.8.
 +
  
 -What's New in Python 3.2.4?
 +What's New in Python 3.3.1?
  ===========================
  
  *Release date: 07-Apr-2013*