Trunk: Merge r7082 from 0.11-stable to fix #7211
Authored by: ecarter 2008-05-17
Parent: [r7083]
Child: [r7085]