Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 13 Dec 2005 16:36:18 +0000 (11:36 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 13 Dec 2005 16:36:18 +0000 (11:36 -0500)

Trivial merge