#6696: merge with 3.3.

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index 83ea595233ac29ff129bd5677a0539a06b13c8c2,2adfb5eba88f3130b9f0f86b409c4c109329c524..17ded2da6815a3d3fe554599d4ba0ac794faa1ab
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -87,7 -82,31 +87,10 @@@ Test
  - Issue #17692: test_sqlite now works with unittest test discovery.
    Patch by Zachary Ware.
  
 -Documentation
 --------------
 -
 -- Issue #15940: Specify effect of locale on time functions.
 -
+ - Issue #6696: add documentation for the Profile objects, and improve
+   profile/cProfile docs.  Patch by Tom Pinckney.
+ 
  
 -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.
 -
 -
  What's New in Python 3.3.1 release candidate 1?
  ===============================================