Replay changeset 70248:c714e2f92f63 from fubar branch.  Original commit message:
Replay changeset 70248:c714e2f92f63 from fubar branch.  Original commit
message:

Cross-port changes for 2.6.7rc2 from the Subversion branch.

pypa/setuptools,pypa/setuptools,pypa/setuptools