From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Tue, 2 Sep 2008 23:39:47 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.13-1~29^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7dab6df00804017844dab244f11e72cc73199fd8;p=monkeysphere.git

Merge commit 'dkg/master'
---

7dab6df00804017844dab244f11e72cc73199fd8