5577ebf Merge branch 'f20' into f21

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