[munin/f15: 12/12] Merge remote-tracking branch 'origin/master' into f15

[Kevin Fenzi]

commit 558c9178d8f0a9d674b2cf1a20ecc082edd2c1cd
Merge: c550798 227cee4
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sun Apr 15 14:58:43 2012 -0600

    Merge remote-tracking branch 'origin/master' into f15
    
    Conflicts:
    	.gitignore
    	munin.spec
    	sources

 .gitignore                    |    3 ++
 munin-1.4.6.tar.gz.sha256sum  |    1 -
 munin-1.4.7.tar.gz.sha256sum  |    1 +
 munin-node.service-privatetmp |   12 ++++++++
 munin.spec                    |   58 +++++++++++++++++++++++++++++++++-------
 sources                       |    1 -
 6 files changed, 64 insertions(+), 12 deletions(-)
---
diff --cc .gitignore
index 84856dd,87dcb6d..c729fac
--- a/.gitignore
+++ b/.gitignore
@@@ -6,4 -6,3 +6,7 @@@ 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