Merge remote-tracking branch 'stevee/selinux'

Conflicts:
	pkgs/ed/ed.nm

diff --cc pkgs/ed/ed.nm
index 73f1453f6588ca4dcb70a0ddde0e68657ed4622b,fb346962571861047828dd9a1b6c61b92f816d69..ca695886b79bde362d65fe81835785121f3228f1
--- 1/pkgs/ed/ed.nm
--- 2/pkgs/ed/ed.nm
+++ b/pkgs/ed/ed.nm
@@@ -26,7 -26,7 +26,7 @@@ include $(PKGROOT)/Includ
  
  PKG_NAME       = ed
  PKG_VER        = 1.5
- PKG_REL        = 1
 -PKG_REL        = 2
++PKG_REL        = 3
  
  PKG_MAINTAINER =
  PKG_GROUPS     = Application/Text