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

[Pavel Lisý]

commit 7ac9a45cc6081a7ca2593ca3255a012240758b14
Merge: e9f0278 8f668b9
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Tue Sep 13 11:29:19 2011 +0200

    Merge branch 'master' into f14

 .gitignore       |    1 +
 cherokee.service |    3 +-
 cherokee.spec    |   99 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 sources          |    2 +-
 4 files changed, 94 insertions(+), 11 deletions(-)
---