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

author Joe Groff <arcata@gmail.com>

Thu, 30 Jul 2009 16:05:36 +0000 (11:05 -0500)

committer Joe Groff <arcata@gmail.com>

Thu, 30 Jul 2009 16:05:36 +0000 (11:05 -0500)
author Joe Groff <arcata@gmail.com>
Thu, 30 Jul 2009 16:05:36 +0000 (11:05 -0500)
committer Joe Groff <arcata@gmail.com>
Thu, 30 Jul 2009 16:05:36 +0000 (11:05 -0500)
diff --cc basis/cpu/x86/assembler/assembler-tests.factor
Simple merge
diff --cc basis/cpu/x86/assembler/assembler.factor
Simple merge
author	Joe Groff <arcata@gmail.com>
	Thu, 30 Jul 2009 16:05:36 +0000 (11:05 -0500)
committer	Joe Groff <arcata@gmail.com>
	Thu, 30 Jul 2009 16:05:36 +0000 (11:05 -0500)
		1	2
basis/cpu/x86/assembler/assembler-tests.factor	patch \|	diff1 \|	diff2 \|	blob \| history
basis/cpu/x86/assembler/assembler.factor	patch \|	diff1 \|	diff2 \|	blob \| history