tree 895e0ee458c30044f6b8c49a7b279e6ccf65325c
parent 80a8003f9236992fce45e6b2d0f33098b55a3859
parent 09e590e5d5a93f2eaa748a89c623258e6bad1648
author Jeff Garzik <jeff@garzik.org> 1155578378 -0400
committer Jeff Garzik <jeff@garzik.org> 1155578378 -0400

Merge branch 'upstream-fixes' into upstream