[wiki:TracDev/SecurityBranch]: Merged log:trunk@...:5510
Authored by: athomas 2007-05-27
Parent: [r5511]
Child: [r5513]