Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 09:29:00 +0000 (04:29 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 09:29:00 +0000 (04:29 -0500)

Trivial merge