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

[fenris02]

commit 781f74548411b13fb6e76b77bec66be10afa9814
Merge: 45921a4 9dd22ae
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Mon Aug 6 23:20:47 2012 -0500

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

 .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                       |    2 +-
 7 files changed, 352 insertions(+), 222 deletions(-)
---