tree 98eab655c0e5d0853267557616cb7059f27f7fc9
parent d3f464b5385531c4250a8b1dbd2f9ba6bbfcebb9
parent 8fc29ba65bd669b8f23a46b4760f3ba773e2a635
author Jeff Garzik <jeff@garzik.org> 1148693194 -0400
committer Jeff Garzik <jeff@garzik.org> 1148693194 -0400

Merge branch 'upstream-fixes' into upstream