Integrate first batch of TracGuide changes, in preparation for 0.12beta1
Authored by: cboos 2010-04-23
Parent: [r9528]
Child: [r9530]