From: Matt Goins <mjgoins@openflows.com>
Date: Mon, 27 Oct 2008 02:41:12 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.23~172
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af267413bbf572b3d63c26bbb64bc15d566e78c5;p=monkeysphere.git

Merge commit 'jrollins/master'
---

af267413bbf572b3d63c26bbb64bc15d566e78c5