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

[Pavel Lisý]

commit 140b235bdad778dc40e768e2548cc5bd01db4df4
Merge: 1a2124b afbdddc
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Mon Oct 10 16:55:14 2011 +0200

    Merge branch 'master' into el6

 .gitignore    |    4 +++-
 cherokee.spec |   51 ++++++++++++++++++++++++++++++++-------------------
 sources       |    2 +-
 3 files changed, 36 insertions(+), 21 deletions(-)
---