Merge branch 'upstream-fixes'
authorJeff Garzik <jeff@garzik.org>
Wed, 12 Apr 2006 22:11:33 +0000 (18:11 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 12 Apr 2006 22:11:33 +0000 (18:11 -0400)

Trivial merge