Merge commit 'mjgoins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 22 Jun 2008 04:27:16 +0000 (00:27 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 22 Jun 2008 04:27:16 +0000 (00:27 -0400)

Trivial merge