TracDiff: merged in changes from trunk (log:trunk#2319:2474), ready to be moved to source:sandbox/trac-diff
Authored by: cboos 2005-11-04
Parent: [r2474]
Child: [r2476]