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

[fenris02]

commit d3125eadc9d32f6a858dd9da1f5b77b691e1f54f
Merge: d9a2510 abc90b3
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Fri Aug 17 23:32:39 2012 -0500

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

 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(-)
---