Merge commit 'jamie/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 29 Jul 2008 15:12:14 +0000 (11:12 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 29 Jul 2008 15:12:14 +0000 (11:12 -0400)

Trivial merge