Merged revisions 69285 via svnmerge from

Tarek Ziadé · Tarek Ziadé · commit 84753dee528c · 2009-02-05T09:08:59.000Z
svn+ssh://pythondev@svn.python.org/python/trunk ........ r69285 | tarek.ziade | 2009-02-05 10:06:23 +0100 (Thu, 05 Feb 2009) | 1 line Fix comment for #1835 ........
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
@@ -12,13 +12,8 @@
 
 # Distutils version
 #
-# Please coordinate with Marc-Andre Lemburg <mal@egenix.com> when adding
-# new features to distutils that would warrant bumping the version number.
+# Updated automatically by the Python release process.
 #
-# In general, major and minor version should loosely follow the Python
-# version number the distutils code was shipped with.
-#
-
 #--start constants--
 __version__ = "3.1a0"
 #--end constants--

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,8 @@`
`12`	`12`
`13`	`13`	`# Distutils version`
`14`	`14`	`#`
`15`		`-# Please coordinate with Marc-Andre Lemburg <[email protected]> when adding`
`16`		`-# new features to distutils that would warrant bumping the version number.`
	`15`	`+# Updated automatically by the Python release process.`
`17`	`16`	`#`
`18`		`-# In general, major and minor version should loosely follow the Python`
`19`		`-# version number the distutils code was shipped with.`
`20`		`-#`
`21`		`-`
`22`	`17`	`#--start constants--`
`23`	`18`	`__version__ = "3.1a0"`
`24`	`19`	`#--end constants--`