e7892da Merge couple of changes from Fedora Rawhide

Authored and Committed by hhorak 10 years ago
    Merge couple of changes from Fedora Rawhide
    
        
file modified
+95 -0
file modified
+11 -9
file modified
+197 -41
file modified
+4 -0