[Python-checkins] cpython (merge 2.6 -> 2.7): Merge from 2.6.

[guido.van.rossum]

http://hg.python.org/cpython/rev/5ae4f3bbaebe
changeset:   68697:5ae4f3bbaebe
branch:      2.7
parent:      68694:89007356798b
parent:      68696:69650b81f4b9
user:        Guido van Rossum <guido at python.org>
date:        Sat Mar 19 16:23:18 2011 -0700
summary:
  Merge from 2.6.

files:
  README

diff --git a/README b/README
--- a/README
+++ b/README
@@ -1,7 +1,8 @@
 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.

-- 
Repository URL: http://hg.python.org/cpython