From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sat, 21 Jun 2008 20:31:27 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.2-1~12^2~5
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=a88632f72e99fe97e77364c9389cbf3d0b9afaec;p=monkeysphere.git

Merge commit 'dkg/master'
---

a88632f72e99fe97e77364c9389cbf3d0b9afaec