From: Matthew Goins <mjgoins@openflows.com>
Date: Sat, 11 Jul 2009 23:04:26 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.25~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b6bd17157915c420b8cda418abc4c658e2da83c6;p=monkeysphere.git

Merge commit 'jrollins/master'
---

b6bd17157915c420b8cda418abc4c658e2da83c6