Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 13 Sep 2006 04:34:46 +0000 (00:34 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 13 Sep 2006 04:34:46 +0000 (00:34 -0400)

Trivial merge