From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Wed, 17 Sep 2008 00:42:49 +0000 (-0700)
Subject: Merge commit 'jamie/master'
X-Git-Tag: monkeysphere_0.16-1~39
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a83949a37cb3f57b67a1d8d2308290f9fd55b93;p=monkeysphere.git

Merge commit 'jamie/master'
---

5a83949a37cb3f57b67a1d8d2308290f9fd55b93