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

[Pavel Lisý]

commit e61e0d619b9e81762e06c1fd90b869e57ea99740
Merge: 058a715 8f668b9
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Tue Sep 13 12:02:39 2011 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	sources

 .gitignore       |    4 ++
 cherokee.service |    3 +-
 cherokee.spec    |   99 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 sources          |    1 +
 4 files changed, 97 insertions(+), 10 deletions(-)
---
diff --cc .gitignore
index 56a3ec8,cbcfe3e..c192ab4
--- a/.gitignore
+++ b/.gitignore
@@@ -4,4 -4,4 +4,8 @@@ cherokee-1.0.8.tar.g
  cherokee-1.0.20.tar.gz
  clog
  cherokee-1.2.1.tar.gz
++<<<<<<< HEAD
 +/openssl-1.0.0d.tar.gz
++=======
+ /cherokee-1.2.99.tar.gz
++>>>>>>> master
diff --cc sources
index cbaee3c,31ff142..750947f
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
 +40b6ea380cc8a5bf9734c2f8bf7e701e  openssl-1.0.0d.tar.gz
+ c83115c3eebb29e6f2b4cc6fe699affe  cherokee-1.2.99.tar.gz