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

Merge commit 'dkg/master'
---

c02230bbe0112a1dea639a5c52ee6db6d446dfea