From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Wed, 11 May 2011 21:21:19 +0000 (-0400)
Subject: Merge branch 'sobol-templates-hotfix'
X-Git-Tag: philo-0.9~13^2
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/15f8778b825a7fad4678e2d650579789ef3115ff

Merge branch 'sobol-templates-hotfix'
---

15f8778b825a7fad4678e2d650579789ef3115ff