Merge branch 'master' of http://github.com/ithinksw/philo
authorStephen Burrows <stephen.r.burrows@gmail.com>
Fri, 28 Jan 2011 16:01:36 +0000 (11:01 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Fri, 28 Jan 2011 16:01:36 +0000 (11:01 -0500)

Trivial merge