Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 11 Jul 2009 23:04:05 +0000 (19:04 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 11 Jul 2009 23:04:05 +0000 (19:04 -0400)

Trivial merge