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

[Pavel Lisý]

commit 0f72bcb2fd02487f36ac639e6378134d285b1080
Merge: 1f95c7c bbbb96d
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Tue Feb 22 15:31:42 2011 +0100

    Merge branch 'master' into el6

 .gitignore       |    1 +
 cherokee.service |   10 ++++++++++
 cherokee.spec    |   24 ++++++++++++++++++++----
 sources          |    2 +-
 4 files changed, 32 insertions(+), 5 deletions(-)
---