Merge commit 'micah/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 3 Sep 2008 22:29:18 +0000 (18:29 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 3 Sep 2008 22:29:18 +0000 (18:29 -0400)

Trivial merge