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

[Lorenzo Villani]

commit ff93b0d7f1c7a39371feb099db69ea1e06f7b84f
Merge: 7618b32 63f335e
Author: Lorenzo Villani <lvillani at binaryhelix.net>
Date:   Wed Sep 1 19:07:55 2010 +0200

    Merge branch 'master' into f12

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