setuptools branch: Merged [3439:3498/trunk].
Authored by: cmlenz 2006-06-30
Parent: [r3498]
Child: [r3500]