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