From: Matt Goins <mjgoins@openflows.com>
Date: Sat, 31 Jan 2009 23:35:31 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.23~158
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7fb3f70a48202153ecb7c43830ded000f8a0e615;p=monkeysphere.git

Merge commit 'jrollins/master'
---

7fb3f70a48202153ecb7c43830ded000f8a0e615