[munin/f17: 3/3] Merge remote-tracking branch 'origin/master' into f17

[fenris02]

commit 3a41429db8a71a15b25ed2250888e81fa5580a07
Merge: e6e0a86 30875d5
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Fri May 18 22:22:08 2012 -0500

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

 GCTime.java.patch   |   11 +++++++++
 cpuspeed.in.rev1243 |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++
 sources             |    1 +
 3 files changed, 71 insertions(+), 0 deletions(-)
---