7a02c68 Pull some fixes from devel over

Authored and Committed by Jesse Keating 14 years ago
    Pull some fixes from devel over
    
        
file modified
+9 -3