Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 18 Aug 2008 20:17:15 +0000 (16:17 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 18 Aug 2008 20:17:15 +0000 (16:17 -0400)

Trivial merge