From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Mon, 2 Mar 2009 18:22:48 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.24~18
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=235f46a482f83ad0531953e77aab50da4d2bdda0;hp=-c;p=monkeysphere.git

Merge commit 'dkg/master'
---

235f46a482f83ad0531953e77aab50da4d2bdda0