Gavin's last patch wasn't applied properly.
Rolled back to r1.6, re-applied patch and added the latter changes again. HTML-Output is fine now.
Authored by: weichinger 2005-03-23
Parent: [r332]
Child: [r334]
