Trunk: Merge r7094 for figleaf support from 0.11-stable
Authored by: ecarter 2008-05-24
Parent: [r7095]
Child: [r7097]