Merge from 2.6.

diff --cc README
index 241a8436ec8db32f4cbb0b76d2b58993bbbad0d8,63af54dc877519d0b3fe1ce019a3ff1bd0124fde..da5753cee9682a9b909db1b8b971764f5da71ce4
--- 1/README
--- 2/README
+++ b/README
@@@ -1,7 -1,8 +1,8 @@@
 -This is Python version 2.6.6
 +This is Python version 2.7.1
  ============================
  
- 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
+ Python Software Foundation.  All rights reserved.
  
  Copyright (c) 2000 BeOpen.com.
  All rights reserved.