Merge 3.3

diff --cc Misc/NEWS
index 04e9f30f3bc1365af7035e3d9c4f2523887afd22,44ae5f008c380aa02bcdcd9d1a1d1913b3c42755..739b52b69539197c29f73b053178a607ed56d8bb
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,6 -12,9 +10,9 @@@ What's New in Python 3.4.0 Alpha 1
  Core and Builtins
  -----------------
  
 -- Issue #16197: Update winreg docstrings and documentation to match code.      
++- Issue #16197: Update winreg docstrings and documentation to match code.
+   Patch by Zachary Ware.
+ 
  - Issue #16241: Document -X faulthandler command line option.
    Patch by Marek Šuppa.