9f95415 Apply upstream update

Authored and Committed by dp67 12 years ago
    Apply upstream update
    
        
file modified
+1 -0
file modified
+32 -7
file modified
+1 -1