~ chicken-core (chicken-5) 0b974fd1c8e9715ea0b1618b55a9bd37f8e9a9f1


commit 0b974fd1c8e9715ea0b1618b55a9bd37f8e9a9f1
Merge: 0a76384f 01502524
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Wed Sep 14 10:07:06 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Wed Sep 14 10:07:06 2011 +0200

    resolved conflicts

Trap