Merge branch 'master' of git.sv.gnu.org:/srv/git/mit-scheme

author Chris Hanson <org/chris-hanson/cph>

Wed, 2 Jun 2010 06:53:33 +0000 (23:53 -0700)

committer Chris Hanson <org/chris-hanson/cph>

Wed, 2 Jun 2010 06:53:33 +0000 (23:53 -0700)
author Chris Hanson <org/chris-hanson/cph>
Wed, 2 Jun 2010 06:53:33 +0000 (23:53 -0700)
committer Chris Hanson <org/chris-hanson/cph>
Wed, 2 Jun 2010 06:53:33 +0000 (23:53 -0700)
diff --cc src/runtime/parse.scm
Simple merge
diff --cc src/runtime/runtime.pkg
Simple merge
author	Chris Hanson <org/chris-hanson/cph>
	Wed, 2 Jun 2010 06:53:33 +0000 (23:53 -0700)
committer	Chris Hanson <org/chris-hanson/cph>
	Wed, 2 Jun 2010 06:53:33 +0000 (23:53 -0700)
		1	2
src/runtime/parse.scm	patch \|	diff1 \|	diff2 \|	blob \| history
src/runtime/runtime.pkg	patch \|	diff1 \|	diff2 \|	blob \| history