#17690: merge with 3.3.

diff --cc Misc/NEWS
index 1336f03d068dd76c0f889abb7b8c4915296a21d5,b8f687b55695bec7dc29a9a3825f6ec96ab0eb5c..7be4c6d02910345eeb585c09f722f94690f9c175
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -81,6 -74,30 +81,9 @@@ Test
  - Issue #12820: add tests for the xml.dom.minicompat module.
    Patch by John Chandler and Phil Connell.
  
 -Documentation
 --------------
 -
 -- Issue #15940: Specify effect of locale on time functions.
 -
 -
 -What's New in Python 3.3.1?
 -===========================
 -
 -*Release date: 07-Apr-2013*
 -
 -Build
 ------
 -
 -- Issue #17550: Fix the --enable-profiling configure switch.
 -
 -Library
 --------
 -
 -- Issue #17625: In IDLE, close the replace dialog after it is used.
 -
+ - Issue #17690: test_time now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  
  What's New in Python 3.3.1 release candidate 1?
  ===============================================