Merge r7310 from 0.11-stable, closes #3563.
Authored by: jonas 2008-07-03
Parent: [r7310]
Child: [r7312]