Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 21 Aug 2008 05:46:15 +0000 (01:46 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 21 Aug 2008 05:46:15 +0000 (01:46 -0400)

Trivial merge