Merge commit 'jamie/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 5 Aug 2008 19:45:50 +0000 (15:45 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 5 Aug 2008 19:45:50 +0000 (15:45 -0400)

Trivial merge