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

Conflicts:
	preseed/one-postinst.sh

git-svn-id: http://svn.openfoundry.org/cloud-interop@14 8e386fc3-0e1f-e211-89d0-001a64c68af4
 * install basic x-window and chromium browser
Merge branch 'master' of https://github.com/jazzwang/cloud-interop