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

[Lorenzo Villani]

commit 1a9c3a81ce3242e5be616129e9ead3e86a588354
Merge: 1d2a67c 63f335e
Author: Lorenzo Villani <lvillani at binaryhelix.net>
Date:   Wed Sep 1 19:07:56 2010 +0200

    Merge branch 'master' into el5

 cherokee.init |    4 ++--
 cherokee.spec |   12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)
---
diff --cc cherokee.init
index f8ffbb0,5b88555..5b88555
mode 100644,100755..100644
--- a/cherokee.init
+++ b/cherokee.init