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

[fenris02]

commit d9a2510a2d8d8024055b4b87ef0026f5b97eeab7
Merge: d21824c f4fff2d
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Tue Aug 14 14:02:30 2012 -0500

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

 .gitignore                   |    1 +
 acpi-2.0.5.patch             |   11 +++++++++++
 munin-2.0.4.tar.gz.sha256sum |    1 -
 munin-2.0.5.tar.gz.sha256sum |    1 +
 munin.spec                   |   10 ++++++++--
 sources                      |    2 +-
 6 files changed, 22 insertions(+), 4 deletions(-)
---