Merge branch 'master' of git://factorcode.org/git/factor

author Doug Coleman <doug.coleman@gmail.com>

Sat, 3 Oct 2009 23:27:38 +0000 (18:27 -0500)

committer Doug Coleman <doug.coleman@gmail.com>

Sat, 3 Oct 2009 23:27:38 +0000 (18:27 -0500)
author Doug Coleman <doug.coleman@gmail.com>
Sat, 3 Oct 2009 23:27:38 +0000 (18:27 -0500)
committer Doug Coleman <doug.coleman@gmail.com>
Sat, 3 Oct 2009 23:27:38 +0000 (18:27 -0500)
diff --cc vm/os-unix.hpp
Simple merge
diff --cc vm/vm.hpp
Simple merge
author	Doug Coleman <doug.coleman@gmail.com>
	Sat, 3 Oct 2009 23:27:38 +0000 (18:27 -0500)
committer	Doug Coleman <doug.coleman@gmail.com>
	Sat, 3 Oct 2009 23:27:38 +0000 (18:27 -0500)
		1	2
vm/os-unix.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
vm/vm.hpp	patch \|	diff1 \|	diff2 \|	blob \| history