9e31cf9 Pick up fixes from git

Authored and Committed by ajax 11 years ago
    Pick up fixes from git
    
        
file modified
+1 -1
file modified
+0 -3