tree 41956fc365923a8c85037c51b8085076d7d8a303
parent 81ce3c4b4d3771866ce74b1c3856b45c3e2549fc
parent ac2164d5e425fa4755bdbab9641d8dab7239b6f5
author Jeff Garzik <jeff@garzik.org> 1156402298 -0400
committer Jeff Garzik <jeff@garzik.org> 1156402298 -0400

Merge branch 'upstream-fixes' into upstream