Integrate recent TracGuide changes, related to #7184.
Authored by: cboos 2008-05-02
Parent: [r6979]
Child: [r6981]