From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Mon, 14 Feb 2011 19:13:19 +0000 (-0500)
Subject: Merge branch 'master' into julian
X-Git-Tag: philo-0.9~15^2~3^2~9
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/6b33b7bcb0da390da4bb1928750f5cdbe1a6800c

Merge branch 'master' into julian
---

6b33b7bcb0da390da4bb1928750f5cdbe1a6800c