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

[fenris02]

commit e6e0a86c2d823b62f2ac7a994edd7fac31f3edbb
Merge: 94923c4 82511c6
Author: D. Johnson <fenris02 at fedoraproject.org>
Date:   Fri May 18 22:01:18 2012 -0500

    Merge remote-tracking branch 'origin/master' into f17
    
    Conflicts:
    	.gitignore

 .gitignore |    5 ++---
 munin.spec |   36 +++++++++++++++++++++++++++++++++++-
 sources    |    2 +-
 3 files changed, 38 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index c729fac,e4b2777..3a6a8c0
--- a/.gitignore
+++ b/.gitignore
@@@ -6,7 -6,5 +6,6 @@@ munin-1.4.5.tar.g
  /munin-1.4.5-no-such-object.patch
  /munin-1.4.6.tar.gz
  /munin-1.4.7.tar.gz
- <<<<<<< HEAD
 +/munin-1.4.7.tar.gz.sha256sum
- =======
- >>>>>>> origin/master
+ /GCTime.java.patch
+ /cpuspeed.in.rev1243