Merge branch 'master' into abi-symbols

author Joe Groff <arcata@gmail.com>

Thu, 1 Apr 2010 22:28:36 +0000 (15:28 -0700)

committer Joe Groff <arcata@gmail.com>

Thu, 1 Apr 2010 22:28:36 +0000 (15:28 -0700)
author Joe Groff <arcata@gmail.com>
Thu, 1 Apr 2010 22:28:36 +0000 (15:28 -0700)
committer Joe Groff <arcata@gmail.com>
Thu, 1 Apr 2010 22:28:36 +0000 (15:28 -0700)
diff --cc basis/cpu/ppc/ppc.factor
Simple merge
diff --cc basis/openssl/libssl/libssl.factor
Simple merge
diff --cc basis/ui/backend/windows/windows.factor
Simple merge
author	Joe Groff <arcata@gmail.com>
	Thu, 1 Apr 2010 22:28:36 +0000 (15:28 -0700)
committer	Joe Groff <arcata@gmail.com>
	Thu, 1 Apr 2010 22:28:36 +0000 (15:28 -0700)
		1	2
basis/cpu/ppc/ppc.factor	patch \|	diff1 \|	diff2 \|	blob \| history
basis/openssl/libssl/libssl.factor	patch \|	diff1 \|	diff2 \|	blob \| history
basis/ui/backend/windows/windows.factor	patch \|	diff1 \|	diff2 \|	blob \| history