Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 26 Apr 2006 10:18:00 +0000 (06:18 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 26 Apr 2006 10:18:00 +0000 (06:18 -0400)

Trivial merge