Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Sun, 12 Mar 2006 01:07:36 +0000 (20:07 -0500)
committerJeff Garzik <jeff@garzik.org>
Sun, 12 Mar 2006 01:07:36 +0000 (20:07 -0500)

Trivial merge