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

[fenris02]

commit 4c4610aa4c2c9aacba76a6398f9feaaffe4d8c9f
Merge: 164959e 0a213ea
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Sep 1 14:41:39 2012 -0500

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

 .gitignore                   |    1 +
 linux-init.d_munin-asyncd.in |    4 ++--
 munin-2.0.5.tar.gz.sha256sum |    1 -
 munin-2.0.6.tar.gz.sha256sum |    1 +
 munin.spec                   |    8 ++++++--
 sources                      |    2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)
---