7c5d4a69d25
author Jeff Garzik <jeff@garzik.org> 1159674341 -0400
committer Jeff Garzik <jeff@garzik.org> 1159674341 -0400

Merge branch 'master' into upstream