~ chicken-core (chicken-5) 53c1f1aa4367dc0a0d7013b9b291c97da503416e

commit 53c1f1aa4367dc0a0d7013b9b291c97da503416e
Merge: 4a275fcc cb22c92c
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Sun Jul 24 22:33:34 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sun Jul 24 22:33:34 2011 +0200

    resolved conflicts