[cherokee/el6/master: 16/16] Merge branch 'master' into el6

[Lorenzo Villani]

commit 13a0c1cfc592708322573d52d394651fd753e2b3
Merge: 1fdc173 5f319b4
Author: Lorenzo Villani <lvillani at binaryhelix.net>
Date:   Sun Aug 29 16:38:44 2010 +0200

    Merge branch 'master' into el6
    
    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(-)
---