54e666e merge two related patches

Authored and Committed by Pavel Šimerda 10 years ago
    merge two related patches
    
        
file modified
+6 -5