e5ad558 Merge branch 'master' into el6

Merged and Committed by pghmcfc 12 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	perl-Path-Class.spec
    	sources
    
        
file modified
+1 -1
file modified
+23 -2
file modified
+1 -1