From: Matt Goins <mjgoins@openflows.com>
Date: Wed, 7 Jan 2009 21:45:25 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~164
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=499aa3840041d9ddd5c680adce059260059aabf9;p=monkeysphere.git

Merge commit 'dkg/master'
---

499aa3840041d9ddd5c680adce059260059aabf9