From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Tue, 24 Jun 2008 02:35:31 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.3-1^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=014bf21eae8b5358d0fc10c92c065e5a5deadab5;p=monkeysphere.git

Merge commit 'dkg/master'
---

014bf21eae8b5358d0fc10c92c065e5a5deadab5