Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 24 Jun 2008 04:50:14 +0000 (00:50 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 24 Jun 2008 04:50:14 +0000 (00:50 -0400)

Trivial merge