From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Wed, 23 Jul 2008 07:10:47 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.5-1~15^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=86b6a09beeba248440d4d9a5e923c799c542420d;p=monkeysphere.git

Merge commit 'dkg/master'
---

86b6a09beeba248440d4d9a5e923c799c542420d