merge 3.3

diff --cc Doc/README.txt
Simple merge

diff --cc Doc/license.rst
Simple merge

diff --cc README
index 6a78046d9fa44fd0ae1e358b35b6313388f632a6,0470b1a1031956f81ddb552eb056879eb035598e..9a2ee014751c4ed05c2ff49e2453b06ce8d834ee
--- 1/README
--- 2/README
+++ b/README
@@@ -1,8 -1,8 +1,8 @@@
 -This is Python version 3.3.3
 -============================
 +This is Python version 3.4.0 beta 1
 +===================================
  
  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
- 2012, 2013 Python Software Foundation.  All rights reserved.
+ 2012, 2013, 2014 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