Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Sat, 1 Apr 2006 19:29:12 +0000 (14:29 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 1 Apr 2006 19:29:12 +0000 (14:29 -0500)

Trivial merge