Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 1 Feb 2009 05:00:54 +0000 (00:00 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 1 Feb 2009 05:00:54 +0000 (00:00 -0500)

Trivial merge