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

[fenris02]

commit a82246b826c030e2379ed3bf40d73b06565d4c99
Merge: 3a41429 9dd22ae
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Mon Aug 6 22:45:37 2012 -0500

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

 .gitignore                    |    2 +
 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                       |    3 +-
 7 files changed, 352 insertions(+), 223 deletions(-)
---
diff --cc .gitignore
index 3a6a8c0,1c6f27c..57fe064
--- a/.gitignore
+++ b/.gitignore
@@@ -6,6 -6,5 +6,8 @@@ munin-1.4.5.tar.g
  /munin-1.4.5-no-such-object.patch
  /munin-1.4.6.tar.gz
  /munin-1.4.7.tar.gz
 +/munin-1.4.7.tar.gz.sha256sum
 +/GCTime.java.patch
 +/cpuspeed.in.rev1243
+ /munin-2.0.2.tar.gz
+ /munin-2.0.4.tar.gz