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

Merge commit 'jrollins/master'
---

1b6ebcddf8226ad4aa29da643060b6410030cf5d