Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Sat, 29 Jul 2006 05:29:27 +0000 (01:29 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 29 Jul 2006 05:29:27 +0000 (01:29 -0400)

Trivial merge