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

[fenris02]

commit 164959ec9c365d2d052f49cd4dabb6129bbadd72
Merge: d3125ea 6763941
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sun Aug 19 23:02:48 2012 -0500

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

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