tree 8c54b5004822958ef0a7603e76a4868582e26d7f
parent c4052da6f0c01a0b059d125d72bb934d0980b798
parent 59a10b172fccaea793352c00fd9065f0a5b4ef70
author Jeff Garzik <jgarzik@pobox.com> 1129686762 -0400
committer Jeff Garzik <jgarzik@pobox.com> 1129686762 -0400

Merge branch 'upstream'