From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sat, 11 Oct 2008 17:50:21 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.16-1~38
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=589b81e8cebece77349bbba828dae5c1fe0ca86a;p=monkeysphere.git

Merge commit 'dkg/master'
---

589b81e8cebece77349bbba828dae5c1fe0ca86a