Merged revisions 77206-77207 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r77206 | benjamin.peterson | 2010-01-01 06:47:54 +0200 (Fri, 01 Jan 2010) | 9 lines
Merged revisions 77203 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77203 | benjamin.peterson | 2009-12-31 22:00:55 -0600 (Thu, 31 Dec 2009) | 1 line
update copyright year
........
................
r77207 | benjamin.peterson | 2010-01-01 06:49:25 +0200 (Fri, 01 Jan 2010) | 9 lines
Merged revisions 77204 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77204 | ezio.melotti | 2009-12-31 22:16:42 -0600 (Thu, 31 Dec 2009) | 1 line
more copyright year updates
........
................
diff --git a/LICENSE b/LICENSE
index 9ce8288..fb0906f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -100,9 +100,9 @@
analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python alone or in any derivative version,
provided, however, that PSF's License Agreement and PSF's notice of copyright,
-i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Python
-Software Foundation; All Rights Reserved" are retained in Python alone or in any
-derivative version prepared by Licensee.
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Python Software Foundation; All Rights Reserved" are retained in Python alone or
+in any derivative version prepared by Licensee.
3. In the event Licensee prepares a derivative work that is based on
or incorporates Python or any part thereof, and wants to make