[cherokee/el5/master: 37/37] Merge branch 'master' into el5

[Lorenzo Villani]

commit 1d2a67c5be6af905949857844c405e306719e5ae
Merge: 052dbf5 5f319b4
Author: Lorenzo Villani <lvillani at binaryhelix.net>
Date:   Sun Aug 29 16:38:15 2010 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	cherokee.init
    	cherokee.spec
    	sources

 .gitignore               |    1 +
 01-drop-privileges.patch |   13 ++++
 cherokee.init            |  144 ++++++++++++++++++++++++++++++----------------
 cherokee.spec            |   34 ++++++++++-
 sources                  |    2 +-
 5 files changed, 141 insertions(+), 53 deletions(-)
---
diff --cc cherokee.init
index 29b8710,f8ffbb0..f8ffbb0
mode 100644,100755..100644
--- a/cherokee.init
+++ b/cherokee.init