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

[fenris02]

commit f6199b6a32f2d11b98d9d43d71cfbf6de03ce113
Merge: 565f175 7a82329
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Mon Feb 4 11:07:53 2013 -0600

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

 munin.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---