0.12dev: Fixed trunk to work with Genshi 0.5.1 (due to [7705]). Also, fixed a regression of [7480].
Authored by: rblank 2008-11-24
Parent: [r7712]
Child: [r7714]