Merge commit 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 7 Apr 2009 06:43:38 +0000 (02:43 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 7 Apr 2009 06:43:38 +0000 (02:43 -0400)

Trivial merge