f24b2c0 Merge branch 'master' into el4

Merged and Committed by Lorenzo Villani 13 years ago
    Merge branch 'master' into el4
    
    Conflicts:
    	.gitignore
    	cherokee.init
    	cherokee.spec
    	sources
    
        
file modified
+1 -0
file modified
+95 -49
file modified
+31 -3
file modified
+1 -1