Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Sat, 1 Apr 2006 20:17:56 +0000 (15:17 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 1 Apr 2006 20:17:56 +0000 (15:17 -0500)

Trivial merge