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

[fenris02]

commit d1dab05d6acc67f1b3d9f0ebfb6e95886f28c03e
Merge: 9759ea7 cf5b632
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Thu Oct 18 21:49:23 2012 -0500

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

 munin.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---