~ chicken-core (chicken-5) 9edaf7d044cac04ece75f0436bcde04d2b96f582

commit 9edaf7d044cac04ece75f0436bcde04d2b96f582
Merge: bd95f13c 560d164c
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Tue Feb 9 11:27:28 2010 +0100
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Tue Feb 9 11:27:28 2010 +0100

    fixed conflicts