Merge remote branch 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 9 Jan 2010 22:27:40 +0000 (17:27 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 9 Jan 2010 22:27:40 +0000 (17:27 -0500)

Trivial merge