Integrate TracGuide changes from t.e.o in preparation for 0.11.4
Authored by: cboos 2009-03-17
Parent: [r7942]
Child: [r7944]