Merge http://oss.tresys.com/git/refpolicy-contrib into master_contrib-merge
"Cleanup a-f done"
Conflicts:
abrt.fc
abrt.if
abrt.te
accountsd.fc
accountsd.if
accountsd.te
acct.if
acct.te
afs.if
afs.te
aiccu.te
aide.fc
aide.if
aide.te
aisexec.fc
aisexec.te
alsa.fc
alsa.te
amavis.fc
amavis.if
amavis.te
anaconda.te
apache.fc
apache.if
apache.te
apcupsd.fc
apcupsd.if
apcupsd.te
apm.fc
apm.if
apm.te
arpwatch.fc
arpwatch.if
arpwatch.te
asterisk.if
asterisk.te
automount.fc
automount.if
automount.te
avahi.fc
avahi.if
avahi.te
awstats.if
awstats.te
bcfg2.fc
bcfg2.if
bcfg2.te
bind.fc
bind.if
bind.te
bitlbee.fc
bitlbee.te
blueman.te
bluetooth.fc
bluetooth.if
bluetooth.te
boinc.fc
boinc.if
boinc.te
brctl.if
bugzilla.if
bugzilla.te
cachefilesd.fc
cachefilesd.if
cachefilesd.te
calamaris.te
callweaver.fc
callweaver.if
callweaver.te
canna.fc
canna.te
ccs.fc
ccs.te
cdrecord.te
certmaster.if
certmaster.te
certmonger.fc
certmonger.te
cfengine.fc
cfengine.if
cfengine.te
cgroup.fc
cgroup.if
cgroup.te
chronyd.fc
chronyd.if
chronyd.te
clamav.fc
clamav.if
clamav.te
cobbler.fc
cobbler.if
cobbler.te
collectd.fc
collectd.if
collectd.te
colord.fc
colord.te
comsat.te
condor.fc
condor.if
condor.te
consolekit.te
corosync.fc
corosync.if
corosync.te
couchdb.fc
couchdb.if
couchdb.te
courier.fc
courier.if
courier.te
cpucontrol.te
cron.fc
cron.if
cron.te
cups.fc
cups.if
cups.te
cvs.if
cvs.te
cyrus.te
daemontools.te
dante.te
dbus.fc
dbus.if
dbus.te
dcc.te
ddclient.if
ddclient.te
ddcprobe.te
denyhosts.te
devicekit.fc
devicekit.if
devicekit.te
dhcp.fc
dhcp.if
dhcp.te
dictd.te
distcc.te
djbdns.if
djbdns.te
dkim.fc
dnsmasq.fc
dnsmasq.if
dnsmasq.te
dovecot.fc
dovecot.if
dovecot.te
dpkg.te
drbd.fc
drbd.if
drbd.te
dspam.fc
dspam.if
dspam.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
firewalld.fc
firewalld.if
firewalld.te
firewallgui.fc
firewallgui.if
firewallgui.te
firstboot.if
firstboot.te
fprintd.te
ftp.fc
ftp.if
ftp.te
games.te
gift.te
git.fc
git.if
git.te
gitosis.fc
gitosis.te
glance.if
glance.te
gnome.fc
gnome.if
gnome.te
gnomeclock.fc
gnomeclock.if
gnomeclock.te
gpg.if
gpg.te
gpm.if
gpm.te
gpsd.te
guest.te
hadoop.if
hadoop.te
hal.te
hddtemp.if
hddtemp.te
howl.te
i18n_input.te
icecast.if
icecast.te
imaze.fc
imaze.te
inetd.te
inn.if
inn.te
irc.fc
irc.if
irc.te
ircd.te
iscsi.fc
iscsi.te
jabber.fc
jabber.if
jabber.te
java.fc
java.te
jockey.fc
jockey.if
jockey.te
kdump.fc
kdump.if
kdump.te
kdumpgui.if
kdumpgui.te
kerberos.fc
kerberos.if
kerberos.te
kerneloops.if
kerneloops.te
keyboardd.fc
keyboardd.if
keyboardd.te
keystone.fc
keystone.if
keystone.te
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.te
livecd.te
lldpad.fc
lldpad.if
lldpad.te
loadkeys.fc
logrotate.te
logwatch.fc
logwatch.te
lpd.fc
lpd.if
lpd.te
mailman.fc
mailman.if
mailman.te
mailscanner.fc
mailscanner.if
mailscanner.te
man2html.fc
man2html.if
man2html.te
mandb.fc
mandb.if
mandb.te
mcelog.fc
mcelog.te
mediawiki.if
memcached.fc
memcached.if
memcached.te
milter.fc
milter.if
milter.te
modemmanager.te
mojomojo.if
mojomojo.te
mono.te
monop.te
mozilla.fc
mozilla.if
mozilla.te
mpd.fc
mpd.te
mplayer.te
mrtg.fc
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.te
networkmanager.fc
networkmanager.if
networkmanager.te
nis.fc
nis.if
nis.te
nscd.fc
nscd.if
nscd.te
nsd.fc
nsd.te
nslcd.if
nslcd.te
ntp.fc
ntp.if
ntp.te
numad.fc
numad.if
numad.te
nut.fc
nut.te
nx.if
oav.fc
oav.te
obex.fc
obex.if
obex.te
oddjob.fc
oddjob.te
oident.te
openvpn.te
openvswitch.fc
openvswitch.if
openvswitch.te
pacemaker.fc
pacemaker.if
pacemaker.te
pads.fc
pads.if
pads.te
passenger.fc
passenger.if
passenger.te
pcmcia.fc
pcmcia.te
pcscd.fc
pcscd.te
pegasus.te
perdition.te
pingd.if
pingd.te
plymouthd.fc
plymouthd.if
plymouthd.te
podsleuth.te
policykit.fc
policykit.if
policykit.te
polipo.fc
polipo.if
polipo.te
portage.fc
portage.te
portmap.fc
portmap.te
portreserve.fc
postfix.fc
postfix.if
postfix.te
postfixpolicyd.te
postgrey.if
ppp.fc
ppp.if
ppp.te
prelink.fc
prelink.te
prelude.fc
prelude.if
prelude.te
privoxy.te
procmail.fc
procmail.te
psad.if
psad.te
ptchown.if
pulseaudio.fc
pulseaudio.if
pulseaudio.te
puppet.fc
puppet.if
puppet.te
pwauth.fc
pwauth.if
pwauth.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
quantum.fc
quantum.if
quantum.te
quota.fc
quota.if
quota.te
rabbitmq.fc
rabbitmq.if
rabbitmq.te
radius.fc
radius.te
raid.fc
raid.if
raid.te
razor.fc
razor.if
razor.te
readahead.fc
readahead.if
readahead.te
realmd.fc
realmd.if
realmd.te
remotelogin.te
resmgr.fc
resmgr.if
rgmanager.fc
rgmanager.if
rgmanager.te
rhcs.fc
rhcs.if
rhcs.te
rhgb.if
rhsmcertd.if
rhsmcertd.te
ricci.fc
ricci.if
ricci.te
rlogin.fc
rlogin.if
rlogin.te
rngd.fc
rngd.if
rngd.te
roundup.te
rpc.fc
rpc.if
rpc.te
rpcbind.fc
rpcbind.if
rpcbind.te
rpm.fc
rpm.te
rshd.te
rssh.fc
rsync.if
rsync.te
rtkit.if
rtkit.te
rwho.te
samba.fc
samba.if
samba.te
sambagui.te
samhain.if
sanlock.fc
sanlock.if
sanlock.te
sasl.if
sasl.te
sblim.if
sblim.te
screen.fc
screen.if
screen.te
sectoolm.fc
sectoolm.te
sendmail.fc
sendmail.if
sendmail.te
sensord.fc
sensord.if
sensord.te
setroubleshoot.if
setroubleshoot.te
shorewall.fc
shorewall.if
shorewall.te
shutdown.fc
shutdown.if
shutdown.te
slpd.fc
slpd.if
slpd.te
smartmon.if
smartmon.te
smoltclient.te
snmp.fc
snmp.if
snmp.te
snort.te
sosreport.fc
sosreport.if
sosreport.te
soundserver.if
spamassassin.fc
spamassassin.if
spamassassin.te
squid.fc
squid.if
squid.te
sssd.fc
sssd.if
sssd.te
stunnel.te
svnserve.fc
svnserve.if
svnserve.te
sxid.te
sysstat.fc
sysstat.te
tcsd.te
telepathy.fc
telepathy.if
telepathy.te
telnet.if
telnet.te
tftp.fc
tftp.if
tftp.te
tgtd.fc
tgtd.if
tgtd.te
thunderbird.te
tmpreaper.te
tor.fc
tor.if
tor.te
tuned.fc
tuned.if
tuned.te
tvtime.te
ucspitcp.te
ulogd.te
uml.if
uml.te
uptime.te
usbmodules.te
usbmuxd.fc
usbmuxd.te
userhelper.fc
userhelper.if
userhelper.te
usernetctl.te
uucp.if
uucp.te
uuidd.fc
uwimap.te
varnishd.te
vdagent.fc
vdagent.if
vdagent.te
vhostmd.if
vhostmd.te
virt.fc
virt.if
virt.te
vlock.te
vnstatd.te
vpn.te
w3c.te
watchdog.te
wdmd.fc
wdmd.if
wdmd.te
webadm.te
webalizer.te
wine.fc
wine.if
wireshark.te
wm.if
wm.te
xen.fc
xen.if
xen.te
xguest.te
xscreensaver.te
yam.te
zabbix.fc
zabbix.if
zabbix.te
zarafa.fc
zarafa.if
zarafa.te
zebra.te
zosremote.te