abd153 - More fixes from upstream

Authored and Committed by Daniel J Walsh 15 years ago
    - More fixes from upstream
    
        
file modified
+1 -1
file modified
+817 -1056
file modified
+5 -2