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

[Pavel Lisý]

commit 072d32b88acff16524b878f91d3674d5c790ec32
Merge: e61e0d6 4cf83c2
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Tue Sep 13 12:23:02 2011 +0200

    Merge branch 'master' into el5

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