TracTimeline: merging changes from [5469:5521/trunk]
Authored by: cboos 2007-05-28
Parent: [r5521]
Child: [r5523]