6874903 oops, sync with devel

Authored and Committed by ajax 14 years ago
    oops, sync with devel
    
        
file modified
+9 -9
file modified
+24 -10