Merge branch 'master' of ssh://git.fedorahosted.org/git/selinux-policy; branch 'master' of http://oss.tresys.com/git/refpolicy
    
    Conflicts:
    	policy/modules/admin/amanda.if
    	policy/modules/system/init.te
    	policy/modules/system/miscfiles.if
    	policy/modules/system/miscfiles.te
    	policy/modules/system/userdomain.if