~ chicken-core (chicken-5) 0a15783abbbd2b01baec1ac5b119f50f5ad5a184

commit 0a15783abbbd2b01baec1ac5b119f50f5ad5a184
Merge: 635d8d3f eca1945c
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Tue Jul 19 12:00:06 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Tue Jul 19 12:00:06 2011 +0200

    resolved conflicts