[munin/el6] (6 commits) ...Merge remote-tracking branch 'origin/master' into el6

[Kevin Fenzi]

Summary of changes:

  0765c5f... fix tmpfiles.d file for f15 (BZ# 731181) (*)
  2c2373f... Add patch to run restorecon in the sysvinit script. This do (*)
  a7f913c... Fix default config file for conf.d/ entries. (*)
  3c5e829... typo (*)
  87f3363... Cleanup dangling symlinks found in the plugins directory af (*)
  0c41298... Merge remote-tracking branch 'origin/master' into el6

(*) This commit already existed in another branch; no separate mail sent