Merge in changes from 3.3.0rc2 release clone.

diff --cc Misc/NEWS
index b961f9fe581f1459114b97ac5aa7aada9d3afcbd,e6e4cbba7cd7de6ffb1e94053de453b4cfbcd88b..0db3e091a3d3277ee61ce1795bd8832c543081f7
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,79 -2,18 +2,83 @@@
  Python News
  +++++++++++
  
- - Issue #13992: The trashcan mechanism is now thread-safe.  This eliminates
-   sporadic crashes in multi-thread programs when several long deallocator
-   chains ran concurrently and involved subclasses of built-in container
-   types.
- 
 +What's New in Python 3.3.1
 +==========================
 +
 +*Release date: XX-XX-XXXX*
 +
 +Core and Builtins
 +-----------------
 +
- - Issue #15822: Really ensure 2to3 grammar pickles are properly installed
-   (replaces fixes for Issue #15645).
- 
 +- 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 #15876: Fix a refleak in the curses module: window.encoding.
 +
 +- 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.
 +
 +Extension Modules
 +-----------------
 +
 +Tests
 +-----
 +
 +- 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?
+ ===========================
+ 
+ *Release date: XX-Sep-2012*
+ 
+ Core and Builtins
+ -----------------
+ 
+ Library
+ -------
+ 
+ 
  What's New in Python 3.3.0 Release Candidate 2?
  ===============================================