Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Mon, 3 Apr 2006 00:41:48 +0000 (20:41 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 3 Apr 2006 00:41:48 +0000 (20:41 -0400)

Trivial merge