Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 2 Sep 2008 22:44:13 +0000 (18:44 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 2 Sep 2008 22:44:13 +0000 (18:44 -0400)

Trivial merge