[selinux-policy: 2/4] Merge branch 'master' of ssh://pkgs.fedoraproject.org/selinux-policy

[Daniel J Walsh]

commit 49b3733c80f055cf24e4d730eb7867d8eb4921c0
Merge: ad10efc 7c693b0
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Thu Dec 15 16:29:52 2011 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/selinux-policy
    
    Conflicts:
    	selinux-policy.spec

 policy-F16.patch    |  110 +++++++++++++++++++++++++++++++++------------------
 selinux-policy.spec |    7 +++-
 2 files changed, 77 insertions(+), 40 deletions(-)
---