Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 18:36:39 +0000 (13:36 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 18:36:39 +0000 (13:36 -0500)

Trivial merge