setuptools branch: Merged [3993:4026/trunk].
Authored by: cmlenz 2006-10-23
Parent: [r4026]
Child: [r4028]