From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sat, 21 Jun 2008 16:36:15 +0000 (-0400)
Subject: Merge commit 'mlcastle/master'
X-Git-Tag: monkeysphere_0.2-1~12^2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4c99f298bd4e7451b3ba0a9d08a4eda9583d544;p=monkeysphere.git

Merge commit 'mlcastle/master'
---

e4c99f298bd4e7451b3ba0a9d08a4eda9583d544