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

[Lorenzo Villani]

commit 82f0269c2c8cb22ef3d6a4255a731546133ea975
Merge: 212bd2d 63f335e
Author: Lorenzo Villani <lvillani at binaryhelix.net>
Date:   Wed Sep 1 19:07:55 2010 +0200

    Merge branch 'master' into f13

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