Merged r7406 from 0.11-stable. Closes #7320.
Authored by: jonas 2008-07-26
Parent: [r7406]
Child: [r7408]