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

Merge commit 'jrollins/master'
---

8e3de9de8bc67b3e9e2c490a7e3142fde7742044