trunk: Merged [7786] from 0.11-stable. Closes #7912.
Authored by: jonas 2009-01-12
Parent: [r7787]
Child: [r7789]