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

author Joe Groff <arcata@gmail.com>

Tue, 1 Sep 2009 01:13:19 +0000 (20:13 -0500)

committer Joe Groff <arcata@gmail.com>

Tue, 1 Sep 2009 01:13:19 +0000 (20:13 -0500)
author Joe Groff <arcata@gmail.com>
Tue, 1 Sep 2009 01:13:19 +0000 (20:13 -0500)
committer Joe Groff <arcata@gmail.com>
Tue, 1 Sep 2009 01:13:19 +0000 (20:13 -0500)
diff --cc basis/classes/struct/prettyprint/prettyprint.factor
Simple merge
author	Joe Groff <arcata@gmail.com>
	Tue, 1 Sep 2009 01:13:19 +0000 (20:13 -0500)
committer	Joe Groff <arcata@gmail.com>
	Tue, 1 Sep 2009 01:13:19 +0000 (20:13 -0500)