61c00cf84fcf0f1a6dc1e8
author Jeff Garzik <jgarzik@pobox.com> 1128870974 -0400
committer Jeff Garzik <jgarzik@pobox.com> 1128870974 -0400

Merge branch 'upstream'
J›Sï—