@rixed
rixed Merge remote-tracking branch 'bmeurer/tags/4.00.1' into more-arch
2f84298 Nov 10, 2012
Merge remote-tracking branch 'bmeurer/tags/4.00.1' into more-arch 
Conflicts:
	VERSION
	boot/ocamlc
	boot/ocamldep
	boot/ocamllex
2f84298