From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Wed, 19 May 2010 09:43:26 +0000 (-0400)
Subject: Merge branch 'master' into advanced-containers
X-Git-Tag: philo-0.9~84^2~1
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/35c2662172ee9968f169b5681b7247d98ab606b6

Merge branch 'master' into advanced-containers
---

35c2662172ee9968f169b5681b7247d98ab606b6