TracGuide: merge recent edits made on t.e.o
Authored by: cboos 2007-12-07
Parent: [r6299]
Child: [r6301]