39f0551 Merge branch 'master' into el5

Merged and Committed by pghmcfc 12 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	perl-Test-Distribution.spec
    
        
file modified
+1 -1
file removed
-1
file modified
+37 -4
file modified
+1 -1