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

[fenris02]

commit b12093318f510be9c1cc3a3f85ae71c353da6dfd
Merge: 4c4610a 4b5cfef
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Sep 8 02:41:44 2012 -0500

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

 munin-2.0.6-OS.pm.7f32c59.patch |   10 ++++++++++
 munin.spec                      |   14 ++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---