From: Matt Goins <mjgoins@openflows.com>
Date: Wed, 18 Feb 2009 20:19:17 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.25~39
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b48f2e80fac8d0fc62537ed07b3d1f1946648cd;p=monkeysphere.git

Merge commit 'jrollins/master'
---

3b48f2e80fac8d0fc62537ed07b3d1f1946648cd