From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Wed, 13 Aug 2008 22:31:52 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.8-1~31
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=5c1046f14ff2e1efda332aa07747661abca0b98f;p=monkeysphere.git

Merge commit 'dkg/master'
---

5c1046f14ff2e1efda332aa07747661abca0b98f