Merge branch 'haskel09talk' of http://git.stderr.nl/matthijs/projects/master-project