~ chicken-core (chicken-5) 2e28a6fe9bbba8f61db4ccfe2712a9901656cb22

commit 2e28a6fe9bbba8f61db4ccfe2712a9901656cb22
Merge: 39c2e525 1178450b
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Wed Mar 2 09:22:34 2011 -0500
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Wed Mar 2 09:22:34 2011 -0500

    resolved conflicts