8dc961f59e81e85c7f92ff04f5ff73c20e8
parent f7492f17f2123f0f4db5f9e8ba89867a7b352658
author Jeff Garzik <jgarzik@pobox.com> 1132344431 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1132344431 -0500

Merge branch 'upstream-fixes'
��VA�