Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 4 Dec 2005 01:34:14 +0000 (20:34 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 4 Dec 2005 01:34:14 +0000 (20:34 -0500)

Trivial merge