setuptools branch: Merged [3968:3992/trunk].
Authored by: cmlenz 2006-10-18
Parent: [r3992]
Child: [r3994]