From: Matt Goins <mjgoins@openflows.com>
Date: Wed, 4 Feb 2009 17:37:26 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.25~44
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c9a361eecab5ea18d0b868580a3d0703517ab677;p=monkeysphere.git

Merge commit 'dkg/master'
---

c9a361eecab5ea18d0b868580a3d0703517ab677