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

[Kevin Fenzi]

commit 948cef443bbdf73e10c94e8e97e038c7bac747bd
Merge: 54777e2 227cee4
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sun Apr 15 14:48:11 2012 -0600

    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	munin.spec

 munin-node.service-privatetmp |   12 +++++++++
 munin.spec                    |   56 ++++++++++++++++++++++++++++++++++------
 2 files changed, 59 insertions(+), 9 deletions(-)
---