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

[Kevin Fenzi]

commit c8b9cd53526e06c1730b9e9ef467eca75118f672
Merge: 302b710 5be8a1c
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri Apr 27 10:14:02 2012 -0600

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

 munin.spec |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)
---