Genshi branch: merged [3803:3815/trunk] (early 0.11dev)
Authored by: cboos 2006-10-02
Parent: [r3819]
Child: [r3821]