~ salmonella-environment-setup (master) 4307fd0336e40490d58b4ec3d4382e12bbcdffc0

commit 4307fd0336e40490d58b4ec3d4382e12bbcdffc0
Merge: 214f790 85a0893
Author:     Peter Bex <peter.bex@xs4all.nl>
AuthorDate: Fri Jan 18 18:32:03 2013 +0100
Commit:     Peter Bex <peter.bex@xs4all.nl>
CommitDate: Fri Jan 18 18:32:03 2013 +0100

    Merge branch 'master' of ssh://code.call-cc.org//usr/local/repos/chicken-infrastructure