merge 3.2

diff --cc Doc/license.rst
Simple merge

diff --cc LICENSE
Simple merge

diff --cc README
index 19791ec669b463c2fd43fd015e7b4268a9a56b65,34bc9e43bbfbad9a67fa28131f0d890367a2d04a..3df3292f93b0dff26c61736101eab32cd6c009be
--- 1/README
--- 2/README
+++ b/README
@@@ -1,8 -1,8 +1,8 @@@
 -This is Python version 3.2.2
 -============================
 +This is Python version 3.3 alpha 0
 +==================================
  
- Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
- Python Software Foundation.  All rights reserved.
+ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+ 2012 Python Software Foundation.  All rights reserved.
  
  Python 3.x is a new version of the language, which is incompatible with the 2.x
  line of releases.  The language is mostly the same, but many details, especially