TracGuide: integrate some updates from t.e.o, made since 0.12rc1.
Authored by: cboos 2010-06-12
Parent: [r9862]
Child: [r9864]