From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Fri, 24 Jul 2009 19:20:58 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.26~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e3fe7faea819ac499ff851539f9af86959741c3a;p=monkeysphere.git

Merge commit 'dkg/master'
---

e3fe7faea819ac499ff851539f9af86959741c3a