3eda79e Port a couple more patches from upstream

Authored and Committed by Petr Machata 10 years ago
    Port a couple more patches from upstream
    
        
file modified
+23 -4