~ chicken-core (chicken-5) 3fe98e5fbf4fb13a85a831cb2c094a11fbb9ee54

commit 3fe98e5fbf4fb13a85a831cb2c094a11fbb9ee54
Merge: 8969da90 e03847a0
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Tue Jun 21 10:14:32 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Tue Jun 21 10:14:32 2011 +0200

    resolved conflicts