From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 15 Nov 2008 23:21:31 +0000 (-0500)
Subject: Merge commit 'mlcastle/master'
X-Git-Tag: monkeysphere_0.22-1~13^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a66dc768e8a6cd46f9b260e7d3421a03cbefc365;p=monkeysphere.git

Merge commit 'mlcastle/master'
---

a66dc768e8a6cd46f9b260e7d3421a03cbefc365