dceb20e Merge branch 'master' into el6

Merged and Committed by pghmcfc 12 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	perl-Try-Tiny.spec
    	sources
    
        
file modified
+1 -1
file modified
+76 -43
file modified
+1 -1