[munin/f13/master: 11/11] Merge remote-tracking branch 'origin/f14/master' into f13/master

[Kevin Fenzi]

commit d28ab0bf62ee65a3ee41250e476080e5ec696bc1
Merge: e0b7e71 45fe626
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Tue Feb 22 12:34:07 2011 -0700

    Merge remote-tracking branch 'origin/f14/master' into f13/master

 munin-1.4.5-df-config |    2 ++
 munin.spec            |   19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---