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

Merge commit 'dkg/master'
---

2c64cd42335d7c0eeb904d9b9bdb09d7fa8456c5