Merge commit 'jamie/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 3 May 2008 16:04:18 +0000 (12:04 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 3 May 2008 16:04:18 +0000 (12:04 -0400)

Trivial merge