From: Jamie McClelland <jm@mayfirst.org>
Date: Tue, 16 Sep 2008 14:01:58 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.16-1~39^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=52301633710bda1bd36fe405dedee386554894b2;p=monkeysphere.git

Merge commit 'dkg/master'
---

52301633710bda1bd36fe405dedee386554894b2