[Python-checkins] python/dist/src LICENSE,1.33,1.34

[anthonybaxter at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16680

Modified Files:
	LICENSE 
Log Message:
merge from branches

Index: LICENSE
===================================================================
RCS file: /cvsroot/python/python/dist/src/LICENSE,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- LICENSE	26 Oct 2004 14:38:48 -0000	1.33
+++ LICENSE	10 Mar 2005 13:47:17 -0000	1.34
@@ -47,7 +47,9 @@
     2.3.2           2.3.1       2002-2003   PSF         yes
     2.3.3           2.3.2       2002-2003   PSF         yes
     2.3.4           2.3.3       2004        PSF         yes
+    2.3.5           2.3.4       2005        PSF         yes
     2.4             2.3         2004        PSF         yes
+    2.4.1           2.4         2005        PSF         yes
 
 Footnotes:
 
@@ -83,9 +85,9 @@
 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 Python Software Foundation; All Rights Reserved"
-are retained in Python alone or in any derivative version prepared
-by Licensee.
+2001, 2002, 2003, 2004, 2005 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