TracGuide: merge recent changes made on t.e.o
Authored by: cboos 2007-12-07
Parent: [r6300]
Child: [r6302]