From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Mon, 9 Feb 2009 04:59:35 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~121
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=770f45b0c1d72a1bb89fd98fe070a6dfdcc4c0bf;p=monkeysphere.git

Merge commit 'dkg/master'
---

770f45b0c1d72a1bb89fd98fe070a6dfdcc4c0bf