Merge branch 'waldo' of git://github.com/melinath/philo into melinath