c59c4dc Integrate fixes from other distributions

Authored and Committed by ssp 16 years ago
    Integrate fixes from other distributions
    
        
file modified
+70 -63
file modified
+5 -4