setuptools branch: Merged [3382:3437/trunk].
Authored by: cmlenz 2006-06-22
Parent: [r3437]
Child: [r3439]