Merge http://oss.tresys.com/git/refpolicy-contrib into master_contrib
     * needs to be clean up
    
    Conflicts:
    	abrt.fc
    	abrt.if
    	abrt.te
    	accountsd.fc
    	accountsd.if
    	accountsd.te
    	acct.if
    	acct.te
    	ada.te
    	afs.if
    	afs.te
    	aiccu.if
    	aiccu.te
    	aide.fc
    	aide.if
    	aide.te
    	aisexec.if
    	aisexec.te
    	alsa.fc
    	alsa.if
    	alsa.te
    	amanda.fc
    	amanda.te
    	amavis.fc
    	amavis.if
    	amavis.te
    	amtu.te
    	anaconda.te
    	apache.fc
    	apache.if
    	apache.te
    	apcupsd.fc
    	apcupsd.if
    	apcupsd.te
    	apm.fc
    	apm.if
    	apm.te
    	apt.fc
    	apt.te
    	arpwatch.fc
    	arpwatch.if
    	arpwatch.te
    	asterisk.if
    	asterisk.te
    	authbind.te
    	automount.fc
    	automount.if
    	automount.te
    	avahi.fc
    	avahi.if
    	avahi.te
    	awstats.if
    	awstats.te
    	backup.te
    	bind.fc
    	bind.if
    	bind.te
    	bitlbee.fc
    	bitlbee.if
    	bitlbee.te
    	bluetooth.fc
    	bluetooth.if
    	bluetooth.te
    	brctl.if
    	brctl.te
    	bugzilla.fc
    	bugzilla.if
    	bugzilla.te
    	calamaris.te
    	canna.fc
    	canna.if
    	canna.te
    	ccs.fc
    	ccs.if
    	ccs.te
    	cdrecord.te
    	certmaster.if
    	certmaster.te
    	certmonger.fc
    	certmonger.if
    	certmonger.te
    	certwatch.te
    	cgroup.fc
    	cgroup.if
    	cgroup.te
    	chronyd.fc
    	chronyd.if
    	chronyd.te
    	clamav.fc
    	clamav.if
    	clamav.te
    	clockspeed.te
    	clogd.if
    	clogd.te
    	cmirrord.fc
    	cmirrord.if
    	cobbler.fc
    	cobbler.if
    	cobbler.te
    	colord.fc
    	colord.if
    	colord.te
    	consolekit.fc
    	consolekit.if
    	consolekit.te
    	corosync.fc
    	corosync.if
    	corosync.te
    	courier.fc
    	courier.if
    	courier.te
    	cpucontrol.fc
    	cpucontrol.te
    	cpufreqselector.te
    	cron.fc
    	cron.if
    	cron.te
    	cups.fc
    	cups.if
    	cups.te
    	cvs.if
    	cvs.te
    	cyphesis.if
    	cyrus.fc
    	cyrus.if
    	cyrus.te
    	daemontools.if
    	daemontools.te
    	dante.te
    	dbadm.te
    	dbus.fc
    	dbus.if
    	dbus.te
    	dcc.fc
    	dcc.if
    	dcc.te
    	ddclient.if
    	ddclient.te
    	ddcprobe.te
    	denyhosts.if
    	denyhosts.te
    	devicekit.fc
    	devicekit.if
    	devicekit.te
    	dhcp.fc
    	dhcp.if
    	dhcp.te
    	dictd.if
    	dictd.te
    	djbdns.te
    	dkim.fc
    	dkim.te
    	dmidecode.te
    	dnsmasq.fc
    	dnsmasq.if
    	dnsmasq.te
    	dovecot.fc
    	dovecot.if
    	dovecot.te
    	dpkg.if
    	dpkg.te
    	entropyd.te
    	evolution.te
    	exim.fc
    	exim.if
    	exim.te
    	fail2ban.fc
    	fail2ban.if
    	fail2ban.te
    	fetchmail.fc
    	fetchmail.if
    	fetchmail.te
    	finger.te
    	firstboot.if
    	firstboot.te
    	fprintd.if
    	fprintd.te
    	ftp.fc
    	ftp.if
    	ftp.te
    	games.te
    	gatekeeper.te
    	gift.te
    	git.fc
    	git.if
    	git.te
    	gitosis.fc
    	gitosis.te
    	glance.fc
    	glance.if
    	glance.te
    	gnome.fc
    	gnome.if
    	gnome.te
    	gnomeclock.fc
    	gnomeclock.if
    	gnomeclock.te
    	gpg.fc
    	gpg.if
    	gpg.te
    	gpm.if
    	gpm.te
    	gpsd.te
    	guest.if
    	guest.te
    	hadoop.if
    	hadoop.te
    	hal.fc
    	hal.if
    	hal.te
    	hddtemp.if
    	hddtemp.te
    	i18n_input.te
    	icecast.if
    	icecast.te
    	ifplugd.if
    	ifplugd.te
    	inetd.if
    	inetd.te
    	inn.fc
    	inn.if
    	inn.te
    	irc.fc
    	irc.if
    	irc.te
    	irqbalance.te
    	iscsi.fc
    	iscsi.te
    	jabber.fc
    	jabber.if
    	jabber.te
    	java.fc
    	java.te
    	kdump.fc
    	kdump.if
    	kdump.te
    	kdumpgui.te
    	kerberos.fc
    	kerberos.if
    	kerberos.te
    	kerneloops.if
    	kismet.if
    	kismet.te
    	ksmtuned.fc
    	ksmtuned.if
    	ksmtuned.te
    	ktalk.te
    	kudzu.fc
    	kudzu.te
    	ldap.fc
    	ldap.if
    	ldap.te
    	likewise.fc
    	likewise.if
    	likewise.te
    	lircd.fc
    	lircd.if
    	lircd.te
    	livecd.if
    	livecd.te
    	loadkeys.fc
    	loadkeys.if
    	loadkeys.te
    	lockdev.te
    	logrotate.te
    	logwatch.fc
    	logwatch.te
    	lpd.fc
    	lpd.if
    	lpd.te
    	mailman.fc
    	mailman.if
    	mailman.te
    	mcelog.fc
    	mcelog.te
    	mediawiki.if
    	memcached.fc
    	memcached.if
    	memcached.te
    	metadata.xml
    	milter.fc
    	milter.if
    	milter.te
    	modemmanager.if
    	modemmanager.te
    	mojomojo.if
    	mojomojo.te
    	mono.te
    	mozilla.fc
    	mozilla.if
    	mozilla.te
    	mpd.fc
    	mpd.if
    	mpd.te
    	mplayer.if
    	mplayer.te
    	mrtg.te
    	mta.fc
    	mta.if
    	mta.te
    	munin.fc
    	munin.if
    	munin.te
    	mysql.fc
    	mysql.if
    	mysql.te
    	nagios.fc
    	nagios.if
    	nagios.te
    	ncftool.if
    	ncftool.te
    	nessus.fc
    	nessus.te
    	networkmanager.fc
    	networkmanager.if
    	networkmanager.te
    	nis.fc
    	nis.if
    	nis.te
    	nscd.if
    	nscd.te
    	nsd.fc
    	nsd.te
    	nslcd.if
    	nslcd.te
    	ntop.te
    	ntp.fc
    	ntp.if
    	ntp.te
    	nut.fc
    	nut.te
    	nx.if
    	nx.te
    	oav.te
    	oddjob.fc
    	oddjob.if
    	oddjob.te
    	oident.if
    	oident.te
    	openct.if
    	openct.te
    	openvpn.fc
    	openvpn.if
    	openvpn.te
    	pads.fc
    	pads.if
    	pads.te
    	passenger.if
    	passenger.te
    	pcmcia.fc
    	pcmcia.te
    	pcscd.fc
    	pcscd.if
    	pcscd.te
    	pegasus.te
    	pingd.if
    	pingd.te
    	plymouthd.fc
    	plymouthd.if
    	plymouthd.te
    	podsleuth.te
    	policykit.fc
    	policykit.if
    	policykit.te
    	portage.fc
    	portage.if
    	portage.te
    	portmap.fc
    	portmap.te
    	portreserve.fc
    	portreserve.if
    	portreserve.te
    	portslave.te
    	postfix.fc
    	postfix.if
    	postfix.te
    	postfixpolicyd.if
    	postfixpolicyd.te
    	postgrey.if
    	postgrey.te
    	ppp.fc
    	ppp.if
    	ppp.te
    	prelink.if
    	prelink.te
    	prelude.fc
    	prelude.if
    	prelude.te
    	privoxy.if
    	privoxy.te
    	procmail.fc
    	procmail.if
    	procmail.te
    	psad.if
    	psad.te
    	pulseaudio.fc
    	pulseaudio.if
    	pulseaudio.te
    	puppet.fc
    	puppet.if
    	puppet.te
    	pyicqt.te
    	pyzor.fc
    	pyzor.if
    	pyzor.te
    	qemu.if
    	qemu.te
    	qmail.fc
    	qmail.if
    	qmail.te
    	qpid.fc
    	qpid.if
    	qpid.te
    	quota.fc
    	quota.if
    	quota.te
    	radius.if
    	radius.te
    	radvd.if
    	raid.fc
    	raid.if
    	raid.te
    	razor.fc
    	razor.if
    	razor.te
    	rdisc.fc
    	readahead.fc
    	readahead.if
    	readahead.te
    	remotelogin.te
    	resmgr.fc
    	resmgr.if
    	rgmanager.fc
    	rgmanager.if
    	rgmanager.te
    	rhcs.fc
    	rhcs.if
    	rhcs.te
    	rhgb.if
    	rhgb.te
    	rhsmcertd.fc
    	rhsmcertd.if
    	rhsmcertd.te
    	ricci.fc
    	ricci.if
    	ricci.te
    	rlogin.fc
    	rlogin.if
    	rlogin.te
    	roundup.if
    	rpc.fc
    	rpc.if
    	rpc.te
    	rpcbind.fc
    	rpcbind.if
    	rpcbind.te
    	rpm.fc
    	rpm.if
    	rpm.te
    	rshd.te
    	rssh.fc
    	rssh.te
    	rsync.if
    	rsync.te
    	rtkit.if
    	rtkit.te
    	rwho.if
    	rwho.te
    	samba.fc
    	samba.if
    	samba.te
    	sambagui.te
    	samhain.if
    	samhain.te
    	sanlock.fc
    	sanlock.if
    	sanlock.te
    	sasl.if
    	sasl.te
    	sblim.fc
    	sblim.if
    	sblim.te
    	screen.fc
    	screen.if
    	screen.te
    	sectoolm.te
    	sendmail.fc
    	sendmail.if
    	sendmail.te
    	setroubleshoot.if
    	setroubleshoot.te
    	shorewall.fc
    	shorewall.if
    	shorewall.te
    	shutdown.fc
    	shutdown.if
    	shutdown.te
    	slocate.te
    	slrnpull.te
    	smartmon.if
    	smartmon.te
    	smokeping.if
    	smokeping.te
    	smoltclient.te
    	snmp.fc
    	snmp.if
    	snmp.te
    	snort.if
    	snort.te
    	sosreport.fc
    	sosreport.if
    	sosreport.te
    	soundserver.if
    	spamassassin.fc
    	spamassassin.if
    	spamassassin.te
    	squid.if
    	squid.te
    	sssd.fc
    	sssd.if
    	sssd.te
    	stunnel.if
    	stunnel.te
    	sxid.te
    	sysstat.fc
    	sysstat.te
    	tcpd.te
    	tcsd.if
    	tcsd.te
    	telepathy.fc
    	telepathy.if
    	telepathy.te
    	telnet.if
    	telnet.te
    	tftp.fc
    	tftp.if
    	tftp.te
    	tgtd.fc
    	tgtd.te
    	thunderbird.te
    	tmpreaper.fc
    	tmpreaper.te
    	tor.fc
    	tor.if
    	tor.te
    	tripwire.te
    	tuned.fc
    	tuned.if
    	tuned.te
    	tvtime.te
    	tzdata.te
    	ucspitcp.if
    	ucspitcp.te
    	ulogd.fc
    	ulogd.if
    	ulogd.te
    	uml.if
    	uml.te
    	updfstab.te
    	uptime.te
    	usbmodules.te
    	usbmuxd.te
    	userhelper.fc
    	userhelper.if
    	userhelper.te
    	usernetctl.if
    	usernetctl.te
    	uucp.if
    	uucp.te
    	uuidd.fc
    	uuidd.if
    	uwimap.te
    	varnishd.if
    	varnishd.te
    	vdagent.fc
    	vdagent.if
    	vdagent.te
    	vhostmd.if
    	vhostmd.te
    	virt.fc
    	virt.if
    	virt.te
    	vlock.te
    	vmware.te
    	vnstatd.fc
    	vnstatd.if
    	vnstatd.te
    	vpn.if
    	vpn.te
    	w3c.te
    	webadm.te
    	webalizer.fc
    	webalizer.te
    	wine.fc
    	wine.if
    	wine.te
    	wireshark.te
    	wm.if
    	wm.te
    	xen.fc
    	xen.if
    	xen.te
    	xfs.if
    	xguest.if
    	xguest.te
    	xscreensaver.te
    	yam.te
    	zabbix.fc
    	zabbix.if
    	zabbix.te
    	zarafa.fc
    	zarafa.if
    	zarafa.te
    	zebra.if
    	zebra.te
    	zosremote.fc
    	zosremote.if
    	zosremote.te