Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 1 Aug 2008 02:55:59 +0000 (22:55 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 1 Aug 2008 02:55:59 +0000 (22:55 -0400)

Trivial merge