dba4b7c sync with f18

Authored and Committed by Jiri Vanek work 10 years ago
    sync with f18
    
        
file modified
+2 -0
file modified
+100 -92
file modified
+2 -2