From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Mon, 18 Aug 2008 15:47:50 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.8-1~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d7d179a481d549a600e44d24d19df219ed497cfd;p=monkeysphere.git

Merge commit 'dkg/master'
---

d7d179a481d549a600e44d24d19df219ed497cfd