807 -0400 committer Jeff Garzik 1154640807 -0400 Merge branch 'upstream-fixes' into upstream ^Y