0.12dev: also integrate the TracGuide changes from ["0.12"]
Authored by: cboos 2009-03-17
Parent: [r7946]
Child: [r7948]