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

Merge commit 'dkg/master'
---

ffe5855c75320bf35b6db1770b4ecbd0012723e8