~ chicken-core (chicken-5) 529b4aebaa486d3c14097499ae8377a3d020ab84

commit 529b4aebaa486d3c14097499ae8377a3d020ab84
Merge: c0349031 9024ae85
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Wed Feb 2 09:25:26 2011 -0500
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Wed Feb 2 09:25:26 2011 -0500

    resolved merge conflicts