From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Thu, 19 Feb 2009 05:59:03 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~64
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a7d9d68be60e5d46c016806a47227cd2f2e5a6c7;p=monkeysphere.git

Merge commit 'dkg/master'
---

a7d9d68be60e5d46c016806a47227cd2f2e5a6c7