From: Joe Marshall <eval.apply@gmail.com>
Date: Sat, 13 Aug 2011 17:08:47 +0000 (-0700)
Subject: Resolve merge conflict.
X-Git-Tag: release-9.2.0~347^2~4
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=f8b5ee265add683adbf46f1a59f95d44c3017055;p=mit-scheme.git

Resolve merge conflict.
---

f8b5ee265add683adbf46f1a59f95d44c3017055