a160af2 Merge branch 'master' into el5

Merged and Committed by pghmcfc 12 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	perl-Sub-Exporter.spec
    
        
file modified
+1 -1
file modified
+102 -41
file modified
+1 -1