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

[Kevin Fenzi]

commit 0c412988ddb766c5399877978e88c91dcfb4cd8e
Merge: 6d80b9e 87f3363
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sat Sep 10 11:44:38 2011 -0600

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

 munin-1.4.6-restorecon.patch |   11 +++++++++++
 munin.spec                   |   34 +++++++++++++++++++++++++---------
 2 files changed, 36 insertions(+), 9 deletions(-)
---