035a578 Update from upstream 1.42

Authored and Committed by yaneti 12 years ago
    Update from upstream 1.42
    
        
file modified
+1 -0
file modified
+5 -1
file modified
+1 -1