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

[Daniel J Walsh]

commit 637b33d9f340055b3090f440328d9c8a5f8dc526
Merge: d652e87 6ac2642
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Fri Apr 15 14:24:32 2011 -0400

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

 policy-F16.patch    |  584 +++++++++++++++++++++++++++++++--------------------
 selinux-policy.spec |   11 +-
 2 files changed, 367 insertions(+), 228 deletions(-)
---
diff --cc selinux-policy.spec
index 759f9c9,5769271..c97299a
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@@ -21,7 -21,7 +21,7 @@@
  Summary: SELinux policy configuration
  Name: selinux-policy
  Version: 3.9.16
- Release: 14.1%{?dist}
 -Release: 15%{?dist}
++Release: 15.1%{?dist}
  License: GPLv2+
  Group: System Environment/Base
  Source: serefpolicy-%{version}.tgz
@@@ -474,6 -472,12 +474,15 @@@ exit 
  %endif
  
  %changelog
++* Fri Apr 15 2011 Dan Walsh <dwalsh at redhat.com> 3.9.16-15.1
++- Add filename transitions
++
+ * Fri Apr 15 2011 Miroslav Grepl <mgrepl at redhat.com> 3.9.16-15
+ - xdm_t needs getsession for switch user 
+ - Every app that used to exec init is now execing systemdctl 
+ - Allow squid to manage krb5_host_rcache_t files 
+ - Allow foghorn to connect to agentx port - Fixes for colord policy
+ 
  * Mon Apr 11 2011 Miroslav Grepl <mgrepl at redhat.com> 3.9.16-14
  - Add Dan's patch to remove 64 bit variants
  - Allow colord to use unix_dgram_socket