tree 193d2959a7b62b48aaf2236447f1378779e55104
parent 66e8bb97055ff22a0e5ea89c0a75a35f8738cc96
parent 2b14c30b46e007a16c665cc86329bf4a1d9ff6ee
author Jeff Garzik <jeff@garzik.org> 1154640037 -0400
committer Jeff Garzik <jeff@garzik.org> 1154640037 -0400

Merge branch 'upstream-fixes' into upstream