From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 27 May 2008 01:46:33 +0000 (-0400)
Subject: merging some changes from jrollins.
X-Git-Tag: monkeysphere_0.1-1~70
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=4f321fb2967f009b8b3330c62bfec2fcc5475418;p=monkeysphere.git

merging some changes from jrollins.
---

4f321fb2967f009b8b3330c62bfec2fcc5475418