Merge git://github.com/melinath/philo into melinath