~ chicken-core (chicken-5) 6cfcc3bf08efe3bfe715cdb8448e55d6cc19be7c

commit 6cfcc3bf08efe3bfe715cdb8448e55d6cc19be7c
Merge: 81006aa1 d689ea38
Author:     felix <bunny351@gmail.com>
AuthorDate: Thu May 27 10:31:45 2010 +0200
Commit:     felix <bunny351@gmail.com>
CommitDate: Thu May 27 10:31:45 2010 +0200

    resolved conflicts