~ chicken-core (chicken-5) c57ec38e126d812e1c3fbf1ddff41883de5a7338

commit c57ec38e126d812e1c3fbf1ddff41883de5a7338
Merge: 67b43481 cd56845c
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Thu Dec 3 17:17:18 2009 +0100
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Thu Dec 3 17:17:18 2009 +0100

    resolved conflicts