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

[fenris02]

commit c7ad44e70afdfabeb190386918088eeae81ccc91
Merge: 867c5dd ec3f259
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Sat Nov 3 19:30:23 2012 -0500

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

 ...0.2-defect-1245-LimitsOld.pm-notify_alias.patch |   29 +++++
 munin.spec                                         |  120 ++++++++++++++-----
 2 files changed, 117 insertions(+), 32 deletions(-)
---