Branch for security maintainence on sarge.
Authored by: otavio 2005-06-19
Parent: [r1820]
Child: [r1822]
