0.11-stable: Merge r6998 from trunk to fix #7147
Authored by: ecarter 2008-05-06
Parent: [r7012]
Child: [r7014]