From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Fri, 20 Feb 2009 20:39:07 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ab955c8153674a61b20671dad7e83cd9c4eb7043;p=monkeysphere.git

Merge commit 'dkg/master'
---

ab955c8153674a61b20671dad7e83cd9c4eb7043