8772419 Merge branch 'f20'

Merged and Committed by twaugh 10 years ago
    Merge branch 'f20'
    
    Conflicts:
    	cups.spec
    
        
file modified
+7 -1