ae1edc3 upstream patch

Authored and Committed by madko 9 years ago
    upstream patch
    
        
file modified
+6 -3
file modified
+1 -1