5611499 Merge branch 'master' into el5

Merged and Committed by pghmcfc 12 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	perl-SUPER.spec
    	sources
    
        
file modified
+1 -1
file removed
-3
file modified
+53 -13
file modified
+1 -1