cfb06e2 Merge with f20

Authored and Committed by Jiri Vanek 10 years ago
    Merge with f20
    
        
file modified
+9 -2