tree 67dc02f39e48a8a37d8f3e4a38422d86f5164820
parent 85d6162d6cea9220e483989817eac0cebc03070e
parent 7bdd720869ff75700b48b132ee71852615b55808
author Jeff Garzik <jgarzik@pobox.com> 1132171978 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1132171978 -0500

Merge branch 'upstream-fixes'