~ chicken-core (chicken-5) de5cfee541907dbdade82ef74a91e46e62f61aa9

commit de5cfee541907dbdade82ef74a91e46e62f61aa9
Merge: d8cab033 92047d86
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Thu Nov 25 09:12:24 2010 -0500
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Thu Nov 25 09:12:24 2010 -0500

    resolved conflicts