TracDiff: merged with trunk (log:trunk#2089:2138)
Authored by: cboos 2005-08-27
Parent: [r2138]
Child: [r2140]