~ chicken-core (chicken-5) 59a962f1c8bf58ae514e47be7d80bdea7cc67b6a

commit 59a962f1c8bf58ae514e47be7d80bdea7cc67b6a
Merge: c0cdcc53 9bf74107
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Sun Jan 10 13:42:38 2010 +0100
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sun Jan 10 13:42:38 2010 +0100

    resolved conflicts