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

[Pavel Lisý]

commit c68b1cc9e0b312491de4496efd0dde0b8cda7055
Merge: 7e20de6 aa61a36
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Tue Feb 21 13:30:34 2012 +0100

    Merge branch 'master' into f15

 cherokee.service |    2 +-
 cherokee.spec    |   30 ++++++++++++++++++------------
 2 files changed, 19 insertions(+), 13 deletions(-)
---