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

[fenris02]

commit 917fc4d85d363a4a0d8f41ca77593e3ff56a3c76
Merge: 510d50a 4b5cfef
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Sep 8 02:28:23 2012 -0500

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

 munin-2.0.6-OS.pm.7f32c59.patch |   10 ++++++++++
 munin.spec                      |   14 ++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---