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

[Pavel Lisý]

commit b226b6a599c5442c56d11adcb04e31ae69fcb68a
Merge: 53e7b22 9839aa6
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Fri Feb 25 13:42:49 2011 +0100

    Merge branch 'master' into el6

 .gitignore    |    1 +
 cherokee.spec |   25 +++++++++++++++++--------
 sources       |    2 +-
 3 files changed, 19 insertions(+), 9 deletions(-)
---