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

[Pavel Lisý]

commit 39cb3f322bb8bbbd933c2052cfb6c497c7f11c71
Merge: 140b235 6cdab2b
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Tue Oct 18 10:08:30 2011 +0200

    Merge branch 'master' into el6

 cherokee.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---