Conflicts:
	CHANGES.txt
	component/slapos/buildout.cfg
	setup.py
	slapos/recipe/kumofs/__init__.py
	slapos/recipe/memcached/__init__.py
	slapos/recipe/mysql/__init__.py
	software/kumofs/software.cfg
	software/mysql-5.1/software.cfg