From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Thu, 4 Sep 2008 00:12:24 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.14-1~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ba1d8c2b29be76bae9b4631de848ce45cfee6edd;p=monkeysphere.git

Merge commit 'dkg/master'
---

ba1d8c2b29be76bae9b4631de848ce45cfee6edd