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

Trivial merge