[Python-checkins] r77206 - in python/branches/py3k: LICENSE Python/getcopyright.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Fri Jan  1 05:47:54 2010
New Revision: 77206

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/LICENSE
   python/branches/py3k/Python/getcopyright.c

Modified: python/branches/py3k/LICENSE
==============================================================================
--- python/branches/py3k/LICENSE	(original)
+++ python/branches/py3k/LICENSE	Fri Jan  1 05:47:54 2010
@@ -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

Modified: python/branches/py3k/Python/getcopyright.c
==============================================================================
--- python/branches/py3k/Python/getcopyright.c	(original)
+++ python/branches/py3k/Python/getcopyright.c	Fri Jan  1 05:47:54 2010
@@ -4,7 +4,7 @@
 
 static char cprt[] = 
 "\
-Copyright (c) 2001-2009 Python Software Foundation.\n\
+Copyright (c) 2001-2010 Python Software Foundation.\n\
 All Rights Reserved.\n\
 \n\
 Copyright (c) 2000 BeOpen.com.\n\