From: Matthew Goins <mjgoins@openflows.com>
Date: Sun, 10 May 2009 22:09:22 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.25~29
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0f427687c9a2458b55502c748d0c44994ff31be7;p=monkeysphere.git

Merge commit 'dkg/master'
---

0f427687c9a2458b55502c748d0c44994ff31be7