Use new style merged recipe.

software/testnode/instance.cfg

@@ -6,7 +6,7 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 
 [testnode]
-recipe = slapos.recipe.testnode
+recipe = slapos.cookbook:testnode
 
 buildbot_binary = ${buildout:bin-directory}/buildbot
 git_binary = ${git:location}/bin/git

software/testnode/software.cfg

@@ -24,7 +24,7 @@ find-links +=
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 74e8bba5b666f7154b0d5ecdfee9dcf6
+md5sum = 03451596826e487dc97d81e27a1e7a73
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -45,7 +45,7 @@ recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
   PyXML
-  slapos.recipe.testnode
+  slapos.cookbook
   slapos.tool.grid
   slapos.tool.proxy
   buildbot