[selinux-policy: 5/7] Eliminate nsplugin from F17

[Daniel J Walsh]

commit 102fd0dcb47837cb30334c3ffc2d7cfe615e2e28
Merge: e9119ee 51bad8c
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Fri Dec 2 14:28:57 2011 -0500

    Eliminate nsplugin from F17

 modules-mls.conf    |   18 +
 policy-F16.patch    | 1816 +++++++++++++++++++++++++++++++--------------------
 selinux-policy.spec |   12 +-
 3 files changed, 1134 insertions(+), 712 deletions(-)
---
diff --cc modules-mls.conf
index d22f31f,90f8b41..8b6117e
--- a/modules-mls.conf
+++ b/modules-mls.conf
@@@ -933,6 -933,13 +933,24 @@@ ntop = modul
  nslcd = module
  
  # Layer: apps
++<<<<<<< HEAD
++||||||| merged common ancestors
++# Module: nsplugin
++#
++# Policy for nspluginwrapper 
++# 
++nsplugin = module
++
++# Layer: apps
++=======
+ # Module: nsplugin
+ #
+ # Policy for nspluginwrapper 
+ # 
+ #nsplugin = module
+ 
+ # Layer: apps
++>>>>>>> 51bad8c183c97b813d9b5250ab04c5bb2a3c45f8
  # Module: mplayer
  #
  # Policy for Mozilla and related web browsers