Merged [8336] from 0.11-stable (#8424).
Authored by: jonas 2009-06-30
Parent: [r8336]
Child: [r8338]