38b9a80 Merge branch 'f21'

Merged and Committed by twaugh 9 years ago
    Merge branch 'f21'
    
    Conflicts:
    	cups.spec
    
        
file added
+399
file added
+271
file modified
+10 -0