TracCrossReferences: merge with log:trunk@...:2536
Also, removed some remaining bits from TracDiff.
Authored by: cboos 2005-11-19
Parent: [r2537]
Child: [r2539]