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

[fenris02]

commit 9b94d60619ad5b0117065ff2dc75c8f3e310435e
Merge: 3ad2c2d 816a065
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Thu Dec 27 10:39:47 2012 -0600

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

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