setuptools branch: Merged [4027:4131/trunk].
Authored by: cmlenz 2006-11-03
Parent: [r4133]
Child: [r4135]