* for testing :
Merge branch 'master' of https://github.com/jazzwang/cloud-interop

Conflicts:
	preseed/one-server.seed