d2a88b3 Merge branch 'f20'

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