From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Fri, 5 Sep 2008 05:35:46 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.15-1~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=55ea6c63bed596b086bdb3d06e64af5f97dbb55a;p=monkeysphere.git

Merge commit 'dkg/master'
---

55ea6c63bed596b086bdb3d06e64af5f97dbb55a