tree 14c910c33c3eb79b35a5d3b5ecf7a299d0860b4c
parent c6fd280766a050b13360d7c2d59a3d6bd3a27d9a
parent a34b6fc04d58ad72fe0cc74cd448f4551bd2ebaf
author Jeff Garzik <jeff@garzik.org> 1155212963 -0400
committer Jeff Garzik <jeff@garzik.org> 1155212963 -0400

Merge branch 'upstream-fixes' into upstream