Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 27 Aug 2008 22:38:48 +0000 (18:38 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 27 Aug 2008 22:38:48 +0000 (18:38 -0400)

Trivial merge