From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Thu, 7 Apr 2011 17:14:35 +0000 (-0400)
Subject: Merge branch 'gilbert' into gilbert-1.3
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/1eb51a5b5ac85607af67275ff3684febd84406c9

Merge branch 'gilbert' into gilbert-1.3
---

1eb51a5b5ac85607af67275ff3684febd84406c9