From: Matt Goins <mjgoins@openflows.com>
Date: Mon, 27 Oct 2008 22:25:06 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~171
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a58d337b9f24e46114912fd0e21a6ecfc22759e7;p=monkeysphere.git

Merge commit 'dkg/master'
---

a58d337b9f24e46114912fd0e21a6ecfc22759e7