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

[Lorenzo Villani]

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

    Merge branch 'master' into el4

 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