Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 25 Oct 2008 18:17:50 +0000 (14:17 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 25 Oct 2008 18:17:50 +0000 (14:17 -0400)

Trivial merge