From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Fri, 22 Aug 2008 07:36:06 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.12-1~75
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ebe1b243ed380d15e909bcbbbb62d8a6e95168cc;p=monkeysphere.git

Merge commit 'dkg/master'
---

ebe1b243ed380d15e909bcbbbb62d8a6e95168cc