Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 24 Aug 2006 04:42:07 +0000 (00:42 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 24 Aug 2006 04:42:07 +0000 (00:42 -0400)

Trivial merge