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

[Lorenzo Villani]

commit 836c33d3afdc87598e680184384175e3969c0d82
Merge: ade2e9d 63f335e
Author: Lorenzo Villani <lvillani at binaryhelix.net>
Date:   Wed Sep 1 19:07:29 2010 +0200

    Merge branch 'master' into f14

 cherokee.init |    4 ++--
 cherokee.spec |   12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)
---