trunk: Merged [7784] from 0.11-stable. Closes #7600.
Authored by: jonas 2009-01-11
Parent: [r7784]
Child: [r7786]