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

[fenris02]

commit f2e9867a41a3e2f72f7689a2ed92cf907fd692d2
Merge: 173f76e 816a065
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Thu Dec 27 10:39:58 2012 -0600

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

 Makefile.config-dist     |   24 ++++++++++++++++++++
 munin-2.0.8-cgitmp.patch |    2 +-
 munin.spec               |   53 +++++++++++++++++----------------------------
 3 files changed, 45 insertions(+), 34 deletions(-)
---