Trunk: Merge r7168 from 0.11-stable to fix my bug. Thanks to jhampton for the fix.
Authored by: ecarter 2008-05-28
Parent: [r7168]
Child: [r7170]