[thttpd/f16: 4/4] Merge branch 'master' into f16

[Matthias Saou]

commit ef06c7138b2c30302947afc766b66547a14f7720
Merge: 71d3c4d cbe6e4e
Author: Matthias Saou <matthias at saou.eu>
Date:   Mon Mar 26 16:11:41 2012 +0200

    Merge branch 'master' into f16

 thttpd.service |    2 +-
 thttpd.spec    |   10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
---