5fc192a Merge branch 'master' into el5

Merged and Committed by timj 10 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	bind-to-tinydns.spec
    	sources
    
        
file modified
+0 -1
file modified
+8 -4
file modified
+4 -0