Merge commit 'jamie/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 16 Sep 2008 19:32:31 +0000 (15:32 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 16 Sep 2008 19:32:31 +0000 (15:32 -0400)

Trivial merge