TracMercurial: merge changes from 0.11 (r5365, r5698:5699) via svnmerge
Authored by: cboos 2007-06-18
Parent: [r5699]
Child: [r5701]