Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 4 Oct 2005 09:30:02 +0000 (05:30 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 4 Oct 2005 09:30:02 +0000 (05:30 -0400)

Trivial merge