Merge commit 'jamie/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 14 Sep 2008 21:48:56 +0000 (17:48 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 14 Sep 2008 21:48:56 +0000 (17:48 -0400)

Trivial merge