Conflicts:
	component/rpm2cpio/buildout.cfg
	component/slapos/buildout.cfg
	setup.py
	slapos/recipe/6tunnel/__init__.py
	slapos/recipe/request.py
	stack/slapos.cfg