~ chicken-core (chicken-5) 7d9b681b5658f087d00bf45c1e1f45df27dd0f86

commit 7d9b681b5658f087d00bf45c1e1f45df27dd0f86
Merge: faeb66eb e03847a0
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Tue Jun 21 10:17:20 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Tue Jun 21 10:17:20 2011 +0200

    resolved conflicts (can you tell I'm hopeless with git?)