merge w master
merge w precise
Merge remote-tracking branch 'origin/master' into vagrant-ubuntu-1304-raring64
Merge commit '8229c9b'

Conflicts:
	Vagrantfile