From: mike castleman <m@mlcastle.net>
Date: Tue, 19 Aug 2008 13:50:49 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.11-1~8^2^2
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=f8776c025caf334fef355e7752cfdd822efc0578;p=monkeysphere.git

Merge commit 'dkg/master'
---

f8776c025caf334fef355e7752cfdd822efc0578