tree 88f81d90021bd38b33622169103988f1e0a66510
parent 783c99f42e221217761e9c319838d5533107f7cb
parent 54caf44da31995df1f51174468fd9e83ca5c67a2
author Jeff Garzik <jeff@garzik.org> 1158811705 -0400
committer Jeff Garzik <jeff@garzik.org> 1158811705 -0400

Merge branch 'upstream-fixes' into upstream