From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Tue, 21 Dec 2010 15:12:03 +0000 (-0500)
Subject: Merge branch 'master' into navigation
X-Git-Tag: philo-0.9~22^2~17^2~8
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/64e4cdefe89f642d349b5908a3bbaec76333e3b2

Merge branch 'master' into navigation
---

64e4cdefe89f642d349b5908a3bbaec76333e3b2