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

[Pavel Lisý]

commit 1a2124b1b4cf9529b22d0600df623fec96a3e25c
Merge: 10b750a 4cf83c2
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Tue Sep 13 12:22:56 2011 +0200

    Merge branch 'master' into el6

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