From: Guido van Rossum <guido@python.org>
Date: Sat, 19 Mar 2011 23:23:18 +0000 (-0700)
Subject: Merge from 2.6.
X-Git-Tag: v2.7.2rc1~235
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dbd4efa21f49d4bae68e0a3d05196712bedc7b46;p=thirdparty%2FPython%2Fcpython.git

Merge from 2.6.
---

dbd4efa21f49d4bae68e0a3d05196712bedc7b46
diff --cc README
index 241a8436ec8d,63af54dc8775..da5753cee968
--- a/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.