~ chicken-core (chicken-5) 400e22dfbdad087bd28eddcb0213d7ce3b45d8ed

commit 400e22dfbdad087bd28eddcb0213d7ce3b45d8ed
Merge: b0439fca 0d314266
Author:     felix <felix@y.(none)>
AuthorDate: Thu Mar 18 21:29:22 2010 +0100
Commit:     felix <felix@y.(none)>
CommitDate: Thu Mar 18 21:29:22 2010 +0100

    fixed conflict