Merge commit 'micah/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 19 Jun 2008 03:42:41 +0000 (23:42 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 19 Jun 2008 03:42:41 +0000 (23:42 -0400)

Trivial merge