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

Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'master' of http://oss.tresys.com/git/refpolicy

Conflicts:
	policy/mcs
	policy/modules/admin/ncftool.fc
	policy/modules/admin/ncftool.if
	policy/modules/admin/ncftool.te
	policy/modules/admin/shorewall.if
	policy/modules/apps/kdumpgui.te
	policy/modules/apps/mozilla.if
	policy/modules/apps/mozilla.te
	policy/modules/apps/qemu.te
	policy/modules/apps/rssh.te
	policy/modules/apps/sambagui.te
	policy/modules/apps/screen.if
	policy/modules/apps/telepathy.fc
	policy/modules/apps/telepathy.if
	policy/modules/apps/telepathy.te
	policy/modules/apps/vmware.te
	policy/modules/apps/webalizer.te
	policy/modules/apps/wm.fc
	policy/modules/kernel/corecommands.fc
	policy/modules/kernel/corenetwork.fc
	policy/modules/kernel/corenetwork.if.in
	policy/modules/kernel/corenetwork.te.in
	policy/modules/kernel/devices.if
	policy/modules/kernel/domain.if
	policy/modules/kernel/files.fc
	policy/modules/kernel/files.if
	policy/modules/kernel/filesystem.fc
	policy/modules/kernel/filesystem.if
	policy/modules/kernel/filesystem.te
	policy/modules/kernel/selinux.if
	policy/modules/kernel/storage.if
	policy/modules/kernel/terminal.fc
	policy/modules/kernel/terminal.if
	policy/modules/roles/sysadm.te
	policy/modules/services/aiccu.if
	policy/modules/services/aiccu.te
	policy/modules/services/aisexec.te
	policy/modules/services/amavis.te
	policy/modules/services/bugzilla.fc
	policy/modules/services/bugzilla.if
	policy/modules/services/bugzilla.te
	policy/modules/services/cgroup.te
	policy/modules/services/cmirrord.fc
	policy/modules/services/cmirrord.if
	policy/modules/services/cobbler.if
	policy/modules/services/colord.fc
	policy/modules/services/colord.if
	policy/modules/services/colord.te
	policy/modules/services/courier.fc
	policy/modules/services/cyrus.fc
	policy/modules/services/dbus.if
	policy/modules/services/dbus.te
	policy/modules/services/dovecot.te
	policy/modules/services/mpd.fc
	policy/modules/services/mpd.if
	policy/modules/services/mpd.te
	policy/modules/services/postfix.fc
	policy/modules/services/vnstatd.fc
	policy/modules/services/vnstatd.if
	policy/modules/services/vnstatd.te
	policy/modules/services/xserver.te
	policy/modules/services/zabbix.fc
	policy/modules/services/zabbix.te
	policy/modules/services/zarafa.fc
	policy/modules/services/zarafa.if
	policy/modules/services/zarafa.te
	policy/modules/system/application.if
	policy/modules/system/authlogin.if
	policy/modules/system/daemontools.if
	policy/modules/system/daemontools.te
	policy/modules/system/fstools.te
	policy/modules/system/init.te
	policy/modules/system/ipsec.fc
	policy/modules/system/ipsec.te
	policy/modules/system/iptables.fc
	policy/modules/system/iptables.if
	policy/modules/system/iptables.te
	policy/modules/system/iscsi.te
	policy/modules/system/libraries.fc
	policy/modules/system/logging.fc
	policy/modules/system/logging.te
	policy/modules/system/sysnetwork.te
	policy/modules/system/userdomain.if