7e0e7af Sync with rawhide

Authored and Committed by jvanek 9 years ago
    Sync with rawhide
    
        
file modified
+17 -2