builder/vmware-vmx: add floppy_files support

builder/vmware: add VMWare Player 6 support

builder/virtualbox: implement `iso_interface` setting

builde/vmware: skip adding floppy again in vmx_data_post step

website: add required value for openstack_provider for rackspace example

Merge branch 'additional-user-variables' of github.com:nBerg/packer into nBerg-additional-user-variables

Conflicts:
	builder/amazon/common/run_config.go

post-processor/vagrant: Change creating boxes for customizing metadata.json

provisioner/ansible: Fix Ansible inventory path on Windows

builder/amazon-instance: Debug the evaluated bundle commands

builder/amazonchroot: can build both PV and HVM images

builder/amazon-chroot: Fix bug with getting ec2 connection instead of source image

Merge branch 'master_add_support_for_tcg_accel_in_qemu_builder_' of github.com:mattthias/packer into mattthias-master_add_support_for_tcg_accel_in_qemu_builder_

Conflicts:
	builder/qemu/builder.go
	website/source/docs/builders/qemu.html.markdown

Conflicts:
	builder/qemu/step_run.go

builder/vmware: Add templating to VMware SSH host option

builder/parallels: Detect path to Parallels Tools ISO automatically