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

[fenris02]

commit aeb2c41867b8ea943a28b809d620f85d9ecc7bcf
Merge: 5635089 7a82329
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Mon Feb 4 11:08:11 2013 -0600

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

 munin.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---