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

[Daniel J Walsh]

commit 5f75e360e4fdc01f9468d9a0065de38f79683b7c
Merge: 59ed31e 2a80c71
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Thu Jun 7 10:14:02 2012 -0400

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

 booleans-targeted.conf                     |   14 +-
 config.tgz                                 |  Bin 71680 -> 3399 bytes
 modules-targeted.conf                      |   92 +-
 permissivedomains.fc                       |    1 +
 permissivedomains.if                       |    1 +
 permissivedomains.pp                       |  Bin 0 -> 94994 bytes
 permissivedomains.te                       |  162 +
 policy-F16.patch                           |74475 ++++++++++++++++++++++--
 policy-rawhide-roleattribute.patch         | 1128 +
 policy-rawhide.patch                       |90452 ++++++++++++++++++++++++++++
 policy_contrib-rawhide-roleattribute.patch |  854 +
 policy_contrib-rawhide.patch               |58863 ++++++++++++++++++
 selinux-policy.spec                        |  592 +-
 sources                                    |    5 +-
 14 files changed, 223019 insertions(+), 3620 deletions(-)
---