Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Sun, 17 Sep 2006 05:06:01 +0000 (01:06 -0400)
committerJeff Garzik <jeff@garzik.org>
Sun, 17 Sep 2006 05:06:01 +0000 (01:06 -0400)

Trivial merge