From: Matthew Goins <mjgoins@openflows.com>
Date: Sat, 11 Jul 2009 23:14:43 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.25~24
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=68aabdc3af7409b66787a68e97a1ce67d695299c;p=monkeysphere.git

Merge commit 'dkg/master'
---

68aabdc3af7409b66787a68e97a1ce67d695299c