[NT]  Berkeley & bsddb3 on vagrant.
[NT]  Berkeley & bsddb3 on vagrant.
Merge remote-tracking branch 'origin/master'

Conflicts:
	setup.sh