Merge branch 'master' into new_gc

author Slava Pestov <slava@slava-pestovs-macbook-pro.local>

Thu, 22 Oct 2009 10:40:57 +0000 (05:40 -0500)

committer Slava Pestov <slava@slava-pestovs-macbook-pro.local>

Thu, 22 Oct 2009 10:40:57 +0000 (05:40 -0500)
author Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Thu, 22 Oct 2009 10:40:57 +0000 (05:40 -0500)
committer Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Thu, 22 Oct 2009 10:40:57 +0000 (05:40 -0500)
diff --cc basis/cpu/x86/x86.factor
Simple merge
diff --cc vm/errors.cpp
Simple merge
diff --cc vm/mach_signal.cpp
Simple merge
diff --cc vm/vm.hpp
Simple merge
author	Slava Pestov <slava@slava-pestovs-macbook-pro.local>
	Thu, 22 Oct 2009 10:40:57 +0000 (05:40 -0500)
committer	Slava Pestov <slava@slava-pestovs-macbook-pro.local>
	Thu, 22 Oct 2009 10:40:57 +0000 (05:40 -0500)
		1	2
basis/cpu/x86/x86.factor	patch \|	diff1 \|	diff2 \|	blob \| history
vm/errors.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
vm/mach_signal.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
vm/vm.hpp	patch \|	diff1 \|	diff2 \|	blob \| history