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

Merge commit 'dkg/master'
---

4bf3771e74fbc352cf385afd6c2ee897e702e45b