trunk: merged remaining changes from stable [10444:10447/branches/0.12-stable].
I also re-did a `svn cp trac/util/dist.py trac/dist.py` in order to keep track of the origin.
Authored by: cboos 2011-01-20
Parent: [r10447]
Child: [r10449]