~ chicken-core (chicken-5) 886bf3a8e208beec626f546688275d6ef3d81a42

commit 886bf3a8e208beec626f546688275d6ef3d81a42
Merge: 92548940 38fdc422
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Fri Sep 10 13:13:07 2010 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Fri Sep 10 13:13:07 2010 +0200

    resolved conflict