Merge commit 'micah/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 26 Oct 2008 22:58:31 +0000 (18:58 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 26 Oct 2008 22:58:31 +0000 (18:58 -0400)

Trivial merge