From: Matt Goins <mjgoins@openflows.com>
Date: Sun, 1 Feb 2009 04:01:59 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.25~50
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c9f3967acec191bd2ec17bfe60359809bf214d0e;p=monkeysphere.git

Merge commit 'dkg/master'
---

c9f3967acec191bd2ec17bfe60359809bf214d0e