Merge branch 'release/1.7.2'
Merge branch 'release/1.8'
Merge branch 'release/1.8.1'
Merge branch 'release/1.8.2'
Merge branch 'release/1.8.3'
Merge branch 'release/1.8.4'
Merge branch '1.9.X'
Merge branch '1.9.X'
Merge branch '1.9.X'
Reinstate dummy --setuptools/--distribute options for backward compatibility.
Merge pull request #451 from pfmoore/dummy_options

Reinstate dummy --setuptools/--distribute options for backward compatibi...
develop branch is now 1.11.dev1
1.10rc1
bundle pip-1.4rc1
bundle pip-1.4rc2
move from setuptools 0.8b2 to 0.8b5
merge from release-1.10
upgrade setuptools from 0.8b5 to 0.8 final
Merge branch 'release-1.10' into develop
bundle pip1.4rc3