Merge remote-tracking branch 'origin/erp5-luke' into erp5

stack/erp5.cfg

@@ -418,10 +418,12 @@ python = ${eggs:python}
 eggs =
   ${lxml-python:egg}
   slapos.toolbox
+  slapos.toolbox[zodbpack]
 
 scripts =
-  killpidfromfile = slapos.systool:killpidfromfile
-  onetimedownload = slapos.toolbox:onetimedownload
+  killpidfromfile
+  onetimedownload
+  zodbpack
 
 [cloudooo]
 recipe = zc.recipe.egg
@@ -541,7 +543,7 @@ setuptools = 0.6c12dev-r88846
 slapos.core = 0.24
 slapos.recipe.build = 0.7
 slapos.recipe.template = 2.3
-slapos.toolbox = 0.21
+slapos.toolbox = 0.23
 smmap = 0.8.2
 socketpool = 0.3.0
 supervisor = 3.0a12