bc4f7b1 Merge branch 'master' into el5

Merged and Committed by pghmcfc 12 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	perl-Test-Requires.spec
    
        
file modified
+71 -42