From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Tue, 5 Oct 2010 21:49:59 +0000 (-0400)
Subject: Merge branch 'embed'
X-Git-Tag: philo-0.9~30^2
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/b768cb7ae3b355a09bbf554522584db729d23c14

Merge branch 'embed'
---

b768cb7ae3b355a09bbf554522584db729d23c14