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

[fenris02]

commit e44288a246f3f686462149fc74842002ef493af6
Merge: 604312a 7e49097
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Fri May 18 23:02:24 2012 -0500

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

 GCTime.java.patch   |   11 +++++++++
 cpuspeed.in.rev1243 |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++
 munin.spec          |   36 ++++++++++++++++++++++++++++++-
 3 files changed, 105 insertions(+), 1 deletions(-)
---