24650f3 Update to upstream 1.4.2 (#851880)

Authored and Committed by pfrields 11 years ago
    Update to upstream 1.4.2 (#851880)
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+13 -7