From: Matt Goins <mjgoins@openflows.com>
Date: Sun, 16 Nov 2008 16:18:38 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~166
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=e7c994d6f67d380ed0de21f1500ec395eaab6640

Merge commit 'dkg/master'
---

e7c994d6f67d380ed0de21f1500ec395eaab6640