Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Sun, 18 Jun 2006 05:22:42 +0000 (01:22 -0400)
committerJeff Garzik <jeff@garzik.org>
Sun, 18 Jun 2006 05:22:42 +0000 (01:22 -0400)

Trivial merge