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

[Kevin Fenzi]

commit 94923c44e86ea2549c976b127992aab512d5be73
Merge: c8b9cd5 0ed044b
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sun May 13 09:40:14 2012 -0600

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

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