Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 2 Sep 2008 23:40:35 +0000 (19:40 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 2 Sep 2008 23:40:35 +0000 (19:40 -0400)

Trivial merge