merge 3.3

diff --cc Doc/license.rst
Simple merge

diff --cc LICENSE
Simple merge

diff --cc README
index 44cd7020e904e9f56168cb56af27969a830d53e5,6040e8f0d0616c979c4806f957f8a8d2ddf23d9f..e14ae552546e5e00b2f865368ab7cb890f089229
--- 1/README
--- 2/README
+++ b/README
@@@ -1,8 -1,8 +1,8 @@@
 -This is Python version 3.3.0
 -============================
 +This is Python version 3.4.0 prerelease
 +=======================================
  
  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
- 2012 Python Software Foundation.  All rights reserved.
+ 2012, 2013 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