9b5a362 Merge patches upstream

Authored and Committed by jdieter 14 years ago
    Merge patches upstream
    
        
file modified
+1 -1
file modified
+7 -6
file modified
+1 -0
file modified
+1 -1