From: mike castleman <m@mlcastle.net>
Date: Tue, 19 Aug 2008 13:50:46 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.11-1~8^2^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c60beabbc89be3175fb470f0bf66ed6c2773aa13;p=monkeysphere.git

Merge commit 'jrollins/master'
---

c60beabbc89be3175fb470f0bf66ed6c2773aa13