c3ccc63 Merge branch 'master' into f13

Merged and Committed by pghmcfc 13 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	perl-Try-Tiny.spec
    
        
file modified
+1 -1
file modified
+16 -10
file modified
+1 -1