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

[fenris02]

commit edbc020c45571c426a9f76d935d394c0f91c5bba
Merge: 8f7150b abc90b3
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Fri Aug 17 22:50:53 2012 -0500

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

 acpi-2.0.5.patch              |    2 +-
 linux-init.d_munin-asyncd.in  |  168 +++++++++++++++++++++++++++++++++++++++++
 munin-asyncd.service          |   13 +++
 munin-fcgi-graph.service      |   11 +++
 munin-fcgi-html.service       |   11 +++
 munin-node.service-privatetmp |    3 +-
 munin.spec                    |   28 ++++++-
 7 files changed, 232 insertions(+), 4 deletions(-)
---