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

[fenris02]

commit f091d7551f416efa0dc42bc713b5df97c73ccd4e
Merge: 931ac1c f4fff2d
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Tue Aug 14 13:46:16 2012 -0500

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

 .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(-)
---
diff --cc .gitignore
index 65068f7,6b112eb..fd52433
--- a/.gitignore
+++ b/.gitignore
@@@ -5,8 -6,6 +5,9 @@@
  /munin-1.4.5-no-such-object.patch
  /munin-1.4.6.tar.gz
  /munin-1.4.7.tar.gz
 +<<<<<<< HEAD
 +<<<<<<< HEAD
 +/munin-1.4.7.tar.gz.sha256sum
  /munin-2.0.2.tar.gz
  /munin-2.0.4.tar.gz
+ /munin-2.0.5.tar.gz