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

[Kevin Fenzi]

commit 33fbbfb0461db7b124df84e1cb2f16b0d7012b05
Merge: 2a2324a 5be8a1c
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri Apr 27 10:59:01 2012 -0600

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

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