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

Merge branch 'master' into julian
---

f212afea06d9af47d895b6b5be592eba347910cf