Trunk: Merge r7168 from 0.11-stable to fix my bug.  Thanks to jhampton for the fix.
Trunk: Merge r7168 from 0.11-stable to fix my bug.  Thanks to jhampton for the fix.
pkdevbox/trac,pkdevbox/trac,pkdevbox/trac,pkdevbox/trac