Merged security fixes from 0.11-stable.
Authored by: jonas 2008-11-08
Parent: [r7663]
Child: [r7665]