~ chicken-core (chicken-5) 53398cc5fe35b317215aeb43ab5ae8640ad1a569

commit 53398cc5fe35b317215aeb43ab5ae8640ad1a569
Merge: 96286a7a 649c2514
Author:     Peter Bex <peter.bex@xs4all.nl>
AuthorDate: Wed Jan 4 20:51:51 2012 +0100
Commit:     Peter Bex <peter.bex@xs4all.nl>
CommitDate: Wed Jan 4 20:51:51 2012 +0100

    Merge branch 'master' into sjamaan-pending
    
    Conflicts:
            runtime.c