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

Merge commit 'dkg/master'
---

9847f362471d81b3f13af72f5a28740c94698c20