~ chicken-core (chicken-5) 1cbc8961efd86101e7233b1054d40e0cc573c72e

commit 1cbc8961efd86101e7233b1054d40e0cc573c72e
Merge: 196dbaeb 8f3446e2
Author:     felix <felix@z.(none)>
AuthorDate: Sat Apr 2 12:27:26 2011 +0200
Commit:     felix <felix@z.(none)>
CommitDate: Sat Apr 2 12:27:26 2011 +0200

    resolved conflicts