Merge commit 'micah/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 16 Nov 2008 05:54:29 +0000 (00:54 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 16 Nov 2008 05:54:29 +0000 (00:54 -0500)

Trivial merge