merge w/ 3.3

diff --cc Lib/idlelib/PathBrowser.py
Simple merge

diff --cc Lib/idlelib/TreeWidget.py
Simple merge

diff --cc Misc/NEWS
index 5fbc8d83d3287edc977e060a576beb28a93087e5,70b183f793147d0c3f71196c274a6f8541f8075a..c20a50b1a27a936e4b22c38a38fdec9c8973db62
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -452,66 -371,33 +452,68 @@@ Documentatio
  - Issue #6696: add documentation for the Profile objects, and improve
    profile/cProfile docs.  Patch by Tom Pinckney.
  
 -- Issue #17915: Fix interoperability of xml.sax with file objects returned by
 -  codecs.open().
 -
 -Build
 +Tests
  -----
  
 -- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
 -  4.8.
 +- Issue #11995: test_pydoc doesn't import all sys.path modules anymore.
  
 -- Issue #17962: Build with OpenSSL 1.0.1e on Windows.
 +C-API
 +-----
  
 +- Issue #15767: Added PyErr_SetImportErrorSubclass().
  
 -What's New in Python 3.3.1?
 -===========================
 +- PyErr_SetImportError() now sets TypeError when its msg argument is set.
  
 -*Release date: 07-Apr-2013*
 +- Issue #9369: The types of `char*` arguments of PyObject_CallFunction() and
 +  PyObject_CallMethod() now changed to `const char*`.  Based on patches by
 +  Jörg Müller and Lars Buitinck.
  
 -Build
 ------
 +- Issue #17206: Py_CLEAR(), Py_DECREF(), Py_XINCREF() and Py_XDECREF() now
 +  expand their arguments once instead of multiple times.  Patch written by Illia
 +  Polosukhin.
  
 -- Issue #17550: Fix the --enable-profiling configure switch.
 +- Issue #17522: Add the PyGILState_Check() API.
 +
 +- Issue #17327: Add PyDict_SetDefault.
  
  IDLE
 --------
 +----
  
 -- Issue #17625: In IDLE, close the replace dialog after it is used.
++- Remove dead imports of imp.
+ 
 +- Issue #18196: Avoid displaying spurious SystemExit tracebacks.
 +
 +- Issue #5492: Avoid traceback when exiting IDLE caused by a race condition.
 +
 +- Issue #17511: Keep IDLE find dialog open after clicking "Find Next".
 +  Original patch by Sarah K.
 +
 +- Issue #18055: Move IDLE off of imp and on to importlib.
 +
 +- Issue #15392: Create a unittest framework for IDLE.
 +  Initial patch by Rajagopalasarma Jayakrishnan.
 +
 +- Issue #14146: Highlight source line while debugging on Windows.
 +
 +- Issue #17838: Allow sys.stdin to be reassigned.
 +
 +- Issue #13495: Avoid loading the color delegator twice in IDLE.
 +
 +- Issue #17798: Allow IDLE to edit new files when specified on command line.
 +
 +- Issue #14735: Update IDLE docs to omit "Control-z on Windows".
 +
 +- Issue #17532: Always include Options menu for IDLE on OS X.
 +  Patch by Guilherme Simões.
 +
 +Build
 +-----
 +
 +- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
 +  4.8.
 +
 +- Issue #15172: Document NASM 2.10+ as requirement for building OpenSSL 1.0.1
 +  on Windows.
  
  What's New in Python 3.3.1 release candidate 1?
  ===============================================