~ chicken-core (chicken-5) c5705f61e3de31c4fa0e35f47dbbb5ceafe05d15

commit c5705f61e3de31c4fa0e35f47dbbb5ceafe05d15
Merge: 021384ba 90682e34
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Thu May 26 09:03:30 2011 -0400
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Thu May 26 09:03:30 2011 -0400

    resolved conflicts

diff --cc buildversion
index 45fc36e8,1163055e..f6cdf409
--- a/buildversion
+++ b/buildversion
@@@ -1,1 -1,1 +1,1 @@@
- 4.6.8
 -4.7.0
++4.7.0