New slapos.core release into master

Merge branch 'slapos'

Conflicts:
	component/slapos/buildout.cfg

component/slapos/buildout.cfg

@@ -111,7 +111,7 @@ scripts =
   slapgrid-supervisorctl = slapos.grid.svcbackend:supervisorctl
   slapgrid-supervisord = slapos.grid.svcbackend:supervisord
   slapproxy = slapos.proxy:main
-  slapos = slapos.slapos:main
+  slapos = slapos.entry:main
 
 [versions]
 zc.buildout = 1.6.0-dev-SlapOS-006
@@ -127,14 +127,14 @@ ipython = 0.13
 lxml = 2.3.5
 meld3 = 0.6.8
 netaddr = 0.7.7
-slapos.core = 0.27
+slapos.core = 0.28.2
 slapos.libnetworkcache = 0.12
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.2
 Flask = 0.9
 
 # Required by:
@@ -146,11 +146,11 @@ Sphinx = 1.1.3
 hexagonit.recipe.download = 1.5.1
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.2
 netifaces = 0.8
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.2
 # slapos.libnetworkcache==0.12
 # supervisor==3.0a12
 # zc.buildout==1.6.0-dev-SlapOS-006
@@ -158,9 +158,9 @@ netifaces = 0.8
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.2
 supervisor = 3.0a12
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.2
 zope.interface = 4.0.1