Merge commit 'micah/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 1 Feb 2009 03:59:33 +0000 (22:59 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 1 Feb 2009 03:59:33 +0000 (22:59 -0500)

Trivial merge