trunk: Backported [7952] from 0.11-stable (#8128)
Authored by: jonas 2009-03-18
Parent: [r7952]
Child: [r7954]