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

[fenris02]

commit 69c85eea3c2059e289eb5bcb5b2219bcdca67821
Merge: aeb2c41 84ae0c2
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Feb 9 14:36:42 2013 -0600

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

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