old changesets
Merge remote-tracking branch 'origin/vagrant-debian-7-wheezy64'

Conflicts:
	vagrant/provision_script.sh