Trunk: Merge r7086 from 0.11-stable to fix #7232
Authored by: ecarter 2008-05-17
Parent: [r7086]
Child: [r7088]