From: melinath <stephen.r.burrows@gmail.com>
Date: Wed, 9 Jun 2010 17:49:56 +0000 (-0400)
Subject: Merge branch 'cleanup'
X-Git-Tag: philo-0.9~82^2~1^2~1
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/b988d30ee8173f12ff54d7f0228239bacf4c723e

Merge branch 'cleanup'
---

b988d30ee8173f12ff54d7f0228239bacf4c723e