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

[Pavel Lisý]

commit 145dfe7c37477852230f4b7172c23a2065392a34
Merge: 5004da6 6cdab2b
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Tue Oct 18 10:00:26 2011 +0200

    Merge branch 'master' into f15

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