Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Sun, 1 Oct 2006 03:55:03 +0000 (23:55 -0400)
committerJeff Garzik <jeff@garzik.org>
Sun, 1 Oct 2006 03:55:03 +0000 (23:55 -0400)

Trivial merge