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

Merge commit 'jrollins/master'
---

82c81bafc0e49dcd6aa507b14cf78af35a609368