Merge remote-tracking branch 'origin/helloworld'

Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.

software/helloworld/instance.cfg

+[buildout]
+parts =
+  dummy
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+[dummy]
+recipe = slapos.recipe.dummy

software/helloworld/software.cfg

+[buildout]
+
+extensions +=
+  mr.developer
+# activates mr.developer
+auto-checkout = *
+versions = versions
+
+find-links += http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+parts =
+  template
+  eggs
+
+unzip = true
+
+[sources]
+# XXX-Cedric : either publish the egg or use mr.developer properly, but DELETE
+# This repository and use slapos.recipe.helloworld.
+slapos.recipe.dummy = git git://github.com/WaterCooled/slapos.recipe.dummy.git
+
+[versions]	
+zc.buildout = 1.5.3-dev-SlapOS-001
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[eggs]
+recipe = zc.recipe.egg
+#eggs = slapos.recipe.helloworld
+eggs = slapos.recipe.dummy