Merge commit 'mlcastle/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 19 Aug 2008 14:47:00 +0000 (10:47 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 19 Aug 2008 14:47:00 +0000 (10:47 -0400)

Trivial merge