From: Matt Goins <mjgoins@openflows.com>
Date: Sat, 21 Feb 2009 22:46:57 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.25~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d0a0622eb3aa83aab551afcc44b587a49952e676;p=monkeysphere.git

Merge commit 'dkg/master'
---

d0a0622eb3aa83aab551afcc44b587a49952e676