Ported security fixes from [milestone:0.9.5] release.
Authored by: cmlenz 2006-04-18
Parent: [r3203]
Child: [r3205]