3304603 Updated patches from master-patches

Authored and Committed by mrunge 11 years ago
    Updated patches from master-patches
    
        
file modified
+2 -0