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

[fenris02]

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

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

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