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

Merge commit 'dkg/master'
---

334f15b617fd89162336697e73c7f5645f0d1d3d