9808e72 Merge branch 'f18' of ssh://pkgs.fedoraproject.org/selinux-policy into f18

Merged and Committed by dwalsh 11 years ago
    Merge branch 'f18' of ssh://pkgs.fedoraproject.org/selinux-policy into f18
    
    Conflicts:
    	selinux-policy.spec
    
        
file modified
+302 -209
file modified
+521 -242
file modified
+56 -4