530f4ad Merge branch 'master' into el6

Merged and Committed by stevetraylen 13 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	perl-Crypt-SMIME.spec
    
        
file modified
+4 -3