Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 15 Nov 2008 21:02:37 +0000 (16:02 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 15 Nov 2008 21:02:37 +0000 (16:02 -0500)

Trivial merge