a8e2221 - More fixes from upstream.

Authored and Committed by twaugh 16 years ago
    - More fixes from upstream.
    
        
file modified
+59408 -922
file modified
+3 -2