From: Jamie McClelland <jm@mayfirst.org>
Date: Tue, 5 Aug 2008 19:03:44 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.8-1~63
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1196cb0515aae9304a366e21ec9dd62ec2513d23;p=monkeysphere.git

Merge commit 'dkg/master'
---

1196cb0515aae9304a366e21ec9dd62ec2513d23