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

[fenris02]

commit 25c2acd6538d9ac72fc4fff7fd4a9f7e907aba5e
Merge: c7ad44e 44f8dbb
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Nov 3 21:52:18 2012 -0500

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

 munin.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---