#13495: merge with 3.3.

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

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

diff --cc Misc/NEWS
index f7147a2fa9fe55cea7c28d9c92c12a34c6cde2ab,39e580b20e66ef30226d4da8ee6b48a51f428a3b..da695dddb34a45b08013c1aa1dca0fe6e50a5fe8
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -246,20 -203,26 +246,22 @@@ Test
  - Issue #6696: add documentation for the Profile objects, and improve
    profile/cProfile docs.  Patch by Tom Pinckney.
  
 +C-API
 +-----
  
 -What's New in Python 3.3.1?
 -===========================
 -
 -*Release date: 07-Apr-2013*
 +- Issue #17522: Add the PyGILState_Check() API.
  
 -Build
 ------
 +- Issue #17327: Add PyDict_SetDefault.
  
 -- Issue #17550: Fix the --enable-profiling configure switch.
  
  IDLE
 --------
 +----
  
 -- Issue #17625: In IDLE, close the replace dialog after it is used.
++- 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".
  
  
  What's New in Python 3.3.1 release candidate 1?