From: Matt Goins <mjgoins@openflows.com>
Date: Sat, 21 Jun 2008 18:59:24 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.4-1~28
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=dfc533d223dfcb0ba954eeab1c45124c82b18bf5

Merge commit 'dkg/master'
---

dfc533d223dfcb0ba954eeab1c45124c82b18bf5