setuptools branch: Merged with [3926:3967/trunk], and fixed some unit tests.
Authored by: cmlenz 2006-10-17
Parent: [r3967]
Child: [r3969]