Merge 0.7.3 release

.hgtags

@@ -62,3 +62,4 @@ ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
 7f2c08e9ca22023d1499c512fccc1513813b7dc4 0.7
 024dd30ed702135f5328975042566e48cc479d7d 0.7.1
 d04c05f035e3a5636006fc34f4be7e6c77035d17 0.7.2
+d212e48e0cef689acba57ed017289c027660b23c 0.7.3

CHANGES.txt

@@ -13,8 +13,6 @@ CHANGES
 0.7.3
 -----
 
-* Rename DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT environment
-  variable to SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT.
 * Issue #1: Disable installation of Windows-specific files on non-Windows systems.
 * Use new sysconfig module with Python 2.7 or >=3.2.
 

README.txt

@@ -12,7 +12,7 @@ Installation Instructions
 Upgrading from Distribute
 =========================
 
-Currently, Distribute disallows installing Setuptools 0.8 over Distribute.
+Currently, Distribute disallows installing Setuptools 0.7+ over Distribute.
 You must first uninstall any active version of Distribute first (see
 `Uninstalling`_).
 

setup.py

@@ -56,7 +56,7 @@ from setuptools.command.test import test as _test
 scripts = []
 
 console_scripts = ["easy_install = setuptools.command.easy_install:main"]
-if os.environ.get("SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") is None:
+if os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") is None:
     console_scripts.append("easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3])
 
 # specific command that is used to generate windows .exe files