Centos
Merge branch 'NHN' of https://github.com/sjohnsen/packer into NHN

Conflicts:
	scripts/ubuntu/puppetrepo.sh