Merge commit 'jamie/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 28 Aug 2008 03:01:11 +0000 (23:01 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 28 Aug 2008 03:01:11 +0000 (23:01 -0400)

Trivial merge