From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 5 Aug 2008 18:15:41 +0000 (-0400)
Subject: merged changes from Jamie McClelland.
X-Git-Tag: monkeysphere_0.8-1~63^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a7e520c59cf969192baf16147d570c9a9365c191;p=monkeysphere.git

merged changes from Jamie McClelland.
---

a7e520c59cf969192baf16147d570c9a9365c191