ba2c971 merged patches upstream

Authored and Committed by Caolan McNamara 18 years ago
    merged patches upstream
    
        
file modified
+1 -0
file modified
+10 -13
file modified
+9 -9
file modified
+1 -1