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

Merge commit 'dkg/master'
---

2221f122107dbae6a9b84cb7763625634fc1765d