merge latest trunk into gitpull/setuptools branch
tree2f68d7908099bcc3d8ce4fb3b31e521c4422bf22
drwxr-xr-x - docutils
drwxr-xr-x - prest
drwxr-xr-x - sandbox
drwxr-xr-x - web