Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 25 Nov 2008 17:16:16 +0000 (12:16 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 25 Nov 2008 17:16:16 +0000 (12:16 -0500)

Trivial merge