Merge commit 'jamie/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 5 May 2008 14:56:18 +0000 (10:56 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 5 May 2008 14:56:18 +0000 (10:56 -0400)

Trivial merge