e015af6 Merge branch 'master' into el6

Merged and Committed by scop 12 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	tomcat-native.spec
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+9 -2