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

[Daniel J Walsh]

commit 0b72d16e07de3519858d5ad8edcbf17850ecfc05
Merge: 8872d3d 76b2f51
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Fri Nov 4 13:34:59 2011 -0400

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

 policy-F16.patch    |   26 +++++++++++++++++++++-----
 selinux-policy.spec |    8 ++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)
---
diff --cc selinux-policy.spec
index fd06d08,3c15438..425e12f
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@@ -485,13 -483,10 +485,21 @@@ SELinux Reference policy mls base modul
  %endif
  
  %changelog
++<<<<<<< HEAD
  * Fri Nov 4 2011 Miroslav Grepl <mgrepl at redhat.com> 3.10.0-54
  - MCS fixes
  - quota fixes
  
 +* Thu Nov 4 2011 Dan Walsh <dwalsh at redhat.com> 3.10.0-53.1
 +- Remove transitions to consoletype
 +
++||||||| merged common ancestors
++=======
++* Fri Nov 4 2011 Miroslav Grepl <mgrepl at redhat.com> 3.10.0-54
++- MCS fixes
++- quota fixes
++
++>>>>>>> 76b2f513a3b64cbd70fb9183587a6e2e5e56dbaa
  * Tue Nov 1 2011 Miroslav Grepl <mgrepl at redhat.com> 3.10.0-53
  - Make nvidia* to be labeled correctly
  - Fix abrt_manage_cache() interface