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'
bump to setuptools-0.8b2
Merge pull request #438 from qwcode/setuptools_0.8

bump to setuptools-0.8b2
Allow -p to take a Python version number (Windows only)
Updated news to note that we now use the merged setuptools
Merge pull request #445 from pfmoore/win32_pythons

Allow -p to take a Python version number (Windows only)
remove unnecessary files due to new setuptools support
Merge pull request #449 from qwcode/new_setuptools_cleanup

remove unnecessary files due to new setuptools support
Remove distribute_from_egg.py as part of switching to merged setuptools
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