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

[fenris02]

commit 4032af78346f62d7edd0a30344219ad626ae8a22
Merge: 8bb1df9 cf5b632
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Thu Oct 18 21:50:04 2012 -0500

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

 munin.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---