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

[fenris02]

commit f645b413faa0ebd67ab85c71e8ea1c63e462e0b8
Merge: f6199b6 84ae0c2
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Feb 9 14:36:10 2013 -0600

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

 httpd_munin-cgi.conf |    2 +-
 munin.spec           |   49 +++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 44 insertions(+), 7 deletions(-)
---