made things gcc-4.0esque (i.e. worked around bugs) thanks to rogue
Authored by: hellcatv 2006-05-09
Parent: [r10209]
Child: [r10211]