From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 18 Jul 2009 18:11:02 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.26~35
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d076a8cd228003e0de7276a93ca5ee7e28057495;p=monkeysphere.git

Merge commit 'dkg/master'
---

d076a8cd228003e0de7276a93ca5ee7e28057495