Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Sat, 27 May 2006 01:30:38 +0000 (21:30 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 27 May 2006 01:30:38 +0000 (21:30 -0400)

Trivial merge