f18bc1b717e4
author Jeff Garzik <jgarzik@pobox.com> 1134459004 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1134459004 -0500

Merge branch 'upstream-fixes'
øVã˜