Merge changes did by Martin in his last security update.
Authored by: otavio 2006-01-19
Parent: [r2804]
Child: [r2806]