0b72d1 Merge branch 'master' of ssh://pkgs.fedoraproject.org/selinux-policy

Merged and Committed by Dan Walsh 13 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/selinux-policy
    
    Conflicts:
    	policy-F16.patch
    	selinux-policy.spec
    
        
file modified
+21 -5
file modified
+8 -0