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

[fenris02]

commit 7729a39e8a89af2977efbfdf5040efa1bff88fe6
Merge: 88352a6 7e49097
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Fri May 18 23:12:09 2012 -0500

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

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