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

[Pavel Lisý]

commit 4fb63769cd7b2c2c7a004333cbc1a7252cdac597
Merge: 7ac9a45 4cf83c2
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Tue Sep 13 12:22:48 2011 +0200

    Merge branch 'master' into f14

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