Merge with 3.3.0 release clone.

diff --cc Misc/NEWS
index 49d68349ff6e8068bef8cb01362cb35928e022f6,bdab245155194bbfb8116c36e996700ae28ae519..9907a481ee6d37798bb8aac8bb2a373d94f1a432
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,123 -2,6 +2,104 @@@
  Python News
  +++++++++++
  
- What's New in Python 3.3.1
- ==========================
++What's New in Python 3.3.1?
++===========================
 +
 +*Release date: XX-XX-XXXX*
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #15379: Fix passing of non-BMP characters as integers for the charmap
 +  decoder (already working as unicode strings).  Patch by Serhiy Storchaka.
 +
 +- Issue #15144: Fix possible integer overflow when handling pointers as
 +  integer values, by using Py_uintptr_t instead of size_t.  Patch by
 +  Serhiy Storchaka.
 +
 +- Issue #15965: Explicitly cast AT_FDCWD as (int).  Required on Solaris 10
 +  (which defines AT_FDCWD as 0xffd19553), harmless on other platforms.
 +
- - Issue #15926: Fix crash after multiple reinitializations of the interpreter.
- 
- - Issue #15895: Fix FILE pointer leak in one error branch of
-   PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file, closeit
-   is false an and set_main_loader() fails.
- 
- - Issue #15900: Fix reference leak in PyUnicode_TranslateCharmap().
- 
 +- Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
 +
 +- Issue #15846: Fix SystemError which happened when using ast.parse in an
 +  exception handler on code with syntax errors.
 +
 +- Issue #15801: Make sure mappings passed to '%' formatting are actually
 +  subscriptable.
 +
 +Library
 +-------
 +
- - Issue #15925: fixed regression in email.utils.parsedate and parsedate_tz
-   handling of empty and non-date strings.
- 
- - Issue #15421: fix an OverflowError in Calendar.itermonthdates() after
++- Issue #15421: Fix an OverflowError in Calendar.itermonthdates() after
 +  datetime.MAXYEAR.  Patch by Cédric Krier.
 +
 +- Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
 +  elements 'meta' and 'param'.
 +
- - Issue #15842: the SocketIO.{readable,writable,seekable} methods now
++- Issue #15842: The SocketIO.{readable,writable,seekable} methods now
 +  raise ValueError when the file-like object is closed.  Patch by Alessandro
 +  Moura.
 +
- - Issue #15882: Change _decimal to accept any coefficient tuple when
-   constructing infinities. This is done for backwards compatibility
-   with decimal.py: Infinity coefficients are undefined in _decimal
-   (in accordance with the specification).
- 
 +- Issue #15876: Fix a refleak in the curses module: window.encoding.
 +
 +- Issue #15881: Fixed atexit hook in multiprocessing.  Original patch
 +  by Chris McDonough.
 +
 +- Issue #15340: Fix importing the random module when /dev/urandom cannot
 +  be opened.  This was a regression caused by the hash randomization patch.
 +
 +- Issue #15841: The readable(), writable() and seekable() methods of BytesIO
 +  and StringIO objects now raise ValueError when the object has been closed.
 +  Patch by Alessandro Moura.
 +
 +- Issue #15447: Use subprocess.DEVNULL in webbrowser, instead of opening
 +  os.devnull explicitly and leaving it open.
 +
 +- Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to
 +  Popen when %action substitutions produce empty strings.
 +
 +- Issue #12776,#11839: call argparse type function (specified by add_argument)
 +  only once. Before, the type function was called twice in the case where the
 +  default was specified and the argument was given as well.  This was
 +  especially problematic for the FileType type, as a default file would always
 +  be opened, even if a file argument was specified on the command line.
 +
 +- Issue #15906: Fix a regression in argparse caused by the preceding change,
 +  when action='append', type='str' and default=[].
 +
 +Extension Modules
 +-----------------
 +
- - Issue #15977: Fix memory leak in Modules/_ssl.c when the function
-   _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann.
- 
 +Tests
 +-----
 +
 +- Issue #15304: Fix warning message when os.chdir() fails inside
 +  test.support.temp_cwd().  Patch by Chris Jerdonek.
 +
 +
 +- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
 +  by Serhiy Storchaka.
 +
 +- Issue #15557: Added a test suite for the webbrowser module, thanks
 +  to Anton Barkovsky.
 +
 +Build
 +-----
 +
 +- Issue #15819: Make sure we can build Python out-of-tree from a readonly
 +  source directory.  (Somewhat related to Issue #9860.)
 +
 +Documentation
 +-------------
 +
 +- Issue #11964: Document a change in v3.2 to the behavior of the indent
 +  parameter of json encoding operations.
 +
 +Tools/Demos
 +-----------
 +
 +
  What's New in Python 3.3.0?
  ===========================
  
@@@ -134,6 -57,8 +155,9 @@@ Extension Module
    dump_traceback_later() and cancel_dump_tracebacks_later() to
    cancel_dump_traceback_later().
  
+ - _decimal module: use only C 89 style comments.
+ 
++
  What's New in Python 3.3.0 Release Candidate 2?
  ===============================================