tree 7db0b8f854201e2ad343ea5b1c6fab7c3bca5a9b
parent fd803241744ad6e4262b6588c6af89e8fb794098
parent 1cf9e8a7865c0ac216034e519cf6b8505055ea50
author Jeff Garzik <jgarzik@pobox.com> 1134450466 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1134450466 -0500

Merge branch 'upstream-fixes'