Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy

diff --cc policy/modules/admin/prelink.te
Simple merge

diff --cc policy/modules/apps/pulseaudio.te
Simple merge

diff --cc policy/modules/apps/qemu.if
Simple merge

diff --cc policy/modules/kernel/terminal.if
Simple merge

diff --cc policy/modules/services/ssh.te
Simple merge

diff --cc policy/modules/services/virt.te
Simple merge

diff --cc policy/modules/system/init.te
Simple merge

diff --cc policy/modules/system/systemd.te
Simple merge

diff --cc policy/modules/system/userdomain.if
Simple merge