From: Matt Goins <mjgoins@openflows.com>
Date: Fri, 5 Dec 2008 02:35:28 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~165
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c3b912f2506c3a150f128a77317085cea599a814;p=monkeysphere.git

Merge commit 'dkg/master'
---

c3b912f2506c3a150f128a77317085cea599a814