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

[Kevin Fenzi]

commit 2a2324a046b0d127b13183d5f06ad7f5fc10e82d
Merge: 5c16be0 227cee4
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sun Apr 15 15:13:29 2012 -0600

    Merge remote-tracking branch 'origin/master' into el6
    
    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.logrotate          |    2 +-
 munin-node.service-privatetmp |   12 +++++++
 munin.spec                    |   64 +++++++++++++++++++++++++++++++++++-----
 sources                       |    1 -
 7 files changed, 73 insertions(+), 11 deletions(-)
---
diff --cc .gitignore
index 3d5c7bd,87dcb6d..f145d46
--- a/.gitignore
+++ b/.gitignore
@@@ -5,4 -6,3 +5,7 @@@
  /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