~ chicken-core (chicken-5) a70ff2e2f9f5b90e5b1eb5d32c01f1fc06082ccf

commit a70ff2e2f9f5b90e5b1eb5d32c01f1fc06082ccf
Merge: 821ba868 3e6d2611
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Mon Sep 6 05:06:25 2010 -0400
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Mon Sep 6 05:06:25 2010 -0400

    resolved conflicts