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

Merge commit 'dkg/master'
---

cec56faf07bb4f3b8d563e4f3c9042b6579356e2