From: Matt Goins <mjgoins@openflows.com>
Date: Fri, 31 Oct 2008 20:05:13 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~168
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=7f79f55addb03d438f1afebfc19be8086f7afc9a;hp=-c;p=monkeysphere.git

Merge commit 'dkg/master'
---

7f79f55addb03d438f1afebfc19be8086f7afc9a