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

author Joe Groff <arcata@gmail.com>

Wed, 19 Aug 2009 20:48:07 +0000 (15:48 -0500)

committer Joe Groff <arcata@gmail.com>

Wed, 19 Aug 2009 20:48:07 +0000 (15:48 -0500)
author Joe Groff <arcata@gmail.com>
Wed, 19 Aug 2009 20:48:07 +0000 (15:48 -0500)
committer Joe Groff <arcata@gmail.com>
Wed, 19 Aug 2009 20:48:07 +0000 (15:48 -0500)
diff --cc core/classes/tuple/tuple.factor
Simple merge
diff --cc core/slots/slots.factor
Simple merge
author	Joe Groff <arcata@gmail.com>
	Wed, 19 Aug 2009 20:48:07 +0000 (15:48 -0500)
committer	Joe Groff <arcata@gmail.com>
	Wed, 19 Aug 2009 20:48:07 +0000 (15:48 -0500)
		1	2
core/classes/tuple/tuple.factor	patch \|	diff1 \|	diff2 \|	blob \| history
core/slots/slots.factor	patch \|	diff1 \|	diff2 \|	blob \| history