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

[fenris02]

commit 6fd288a1771b75cc2ca890ba51e09a43697f8dcd
Merge: d317b51 816a065
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Thu Dec 27 10:37:32 2012 -0600

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

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