[munin/f17: 3/3] Merge remote-tracking branch 'origin/master' into f17

[fenris02]

commit 8da9616b384f8f1594ec12dee4e51a5e1839176d
Merge: afc2a35 94bb6cd
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Mar 23 19:33:55 2013 -0500

    Merge remote-tracking branch 'origin/master' into f17

 munin-asyncd.service |    3 +--
 munin.spec           |   24 ++++++++++++------------
 2 files changed, 13 insertions(+), 14 deletions(-)
---