d11c4a Merge commit '00b5712ba4b41ef0dd2ef8d193c66badead1dc91' into el5

Merged and Committed by Michel Alexandre Salim 13 years ago
    Merge commit '00b5712ba4b41ef0dd2ef8d193c66badead1dc91' into el5
    
    Conflicts:
    	.gitignore
    	cvsps.spec
    
        
file modified
+1 -1
file modified
+34 -8
file modified
+1 -1