19dba67 patches from upstream

Authored and Committed by Seth Vidal 16 years ago
    patches from upstream
    
        
file modified
+11 -4