Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 15 Aug 2008 18:28:30 +0000 (14:28 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 15 Aug 2008 18:28:30 +0000 (14:28 -0400)

Trivial merge