From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Thu, 23 Dec 2010 17:08:34 +0000 (-0500)
Subject: Merge branch 'master' into navigation
X-Git-Tag: philo-0.9~22^2~17^2~4
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/0adc7822400fb7fa49bc15a13e3e74e997184e80

Merge branch 'master' into navigation
---

0adc7822400fb7fa49bc15a13e3e74e997184e80