~ chicken-core (chicken-5) 311bff094b4586ae0581ad44d7e686c5de2b02ad

commit 311bff094b4586ae0581ad44d7e686c5de2b02ad
Merge: b6217679 74e04d7c
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Sun Jan 17 00:35:46 2010 +0100
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sun Jan 17 00:35:46 2010 +0100

    resolved conflicts