Merge branch 'master' of https://github.com/melinath/philo
authorHarris Lapiroff <hlapirof@oberlin.edu>
Tue, 5 Apr 2011 16:56:52 +0000 (12:56 -0400)
committerHarris Lapiroff <hlapirof@oberlin.edu>
Tue, 5 Apr 2011 16:56:52 +0000 (12:56 -0400)

Trivial merge