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

[fenris02]

commit 66d1078e4e2057bd21a4da4ffc4bc9ffcb8c9567
Merge: dd85f7c 6763941
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sun Aug 19 22:49:31 2012 -0500

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

 munin.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---