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

[fenris02]

commit d21824c007c135f7172ca7d51d5d0c08030aa77b
Merge: 7729a39 9dd22ae
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Mon Aug 6 23:35:51 2012 -0500

    Merge remote-tracking branch 'origin/master' into el5
    
    Conflicts:
    	.gitignore

 .gitignore                    |    5 +-
 GCTime.java.patch             |   11 -
 munin-1.4.7.tar.gz.sha256sum  |    1 -
 munin-2.0.4-Utils-cluck.patch |   12 +
 munin-2.0.4.tar.gz.sha256sum  |    1 +
 munin.spec                    |  545 +++++++++++++++++++++++++----------------
 sources                       |    2 +-
 7 files changed, 352 insertions(+), 225 deletions(-)
---
diff --cc .gitignore
index 39bd3c5,1c6f27c..0790703
--- a/.gitignore
+++ b/.gitignore
@@@ -1,8 -1,4 +1,6 @@@
  munin-1.4.5.tar.gz
- <<<<<<< HEAD
 +/munin-1.4.7.tar.gz
 +/munin-1.4.7.tar.gz.sha256sum
- =======
  /munin-node.service
  /munin-1.4.5.tar.gz
  /munin-1.4.5-rundir-conf.patch