TracRevisionLog: merged first part of changes from 0.11.6dev to trunk.
Authored by: cboos 2009-07-30
Parent: [r8420]
Child: [r8422]