450681f Merge branch 'master' into f14

Merged and Committed by scop 13 years ago
    Merge branch 'master' into f14
    
    Conflicts:
    	ccache.spec
    
        
file modified
+1 -1
file modified
+8 -5
file modified
+1 -1