TracDiff: merged with trunk (log:trunk#2197:2283)
Authored by: cboos 2005-09-22
Parent: [r2283]
Child: [r2285]