Genshi branch: merged [3816:3830/trunk]
Authored by: cboos 2006-10-03
Parent: [r3830]
Child: [r3832]