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

Merge commit 'dkg/master'
---

d8d8885602a02f0c8f0c964926c88cabee773b91