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

[fenris02]

commit d54bc75625ccc226211dae1ce1d8f1c747857343
Merge: 917fc4d 53ba900
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sun Oct 7 17:05:30 2012 -0500

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

 .gitignore                      |    1 +
 linux-init.d_munin-asyncd.in    |    4 +-
 munin-2.0.6-OS.pm.7f32c59.patch |   10 ---
 munin-2.0.6.tar.gz.sha256sum    |    1 -
 munin-2.0.7-http_loadtime.patch |   11 ++++
 munin-2.0.7.tar.gz.sha256sum    |    1 +
 munin-node.rc                   |   65 +++++++++++++++++++++
 munin.cron.d                    |    7 ++
 munin.spec                      |  121 +++++++++++++++++++++++++-------------
 sources                         |    2 +-
 10 files changed, 167 insertions(+), 56 deletions(-)
---