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

Conflicts:
	Vagrantfile
Merge commit 'e81532b' into vagrant-ubuntu-1304-raring64
Merge commit '773fe5e' from raring
Merge remote-tracking branch 'origin/vagrant-ubuntu-lts-precise64' into vagrant-ubuntu-1304-raring64
Merge remote-tracking branch 'origin/vagrant-ubuntu-1304-raring64'
Vagrantfile: Mac: NFS (bsd) options on /srv mount
Merge remote-tracking branch 'origin/vagrant-ubuntu-lts-precise64' -> master
Merge remote-tracking branch 'origin/master' into vagrant-ubuntu-lts-precise64