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

[fenris02]

commit eebc797da6d7818d2642be65ca8f04fd93d72a98
Merge: cd15cd8 780a4b7
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Fri Mar 1 10:03:39 2013 -0600

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

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