Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Sun, 24 Sep 2006 05:52:47 +0000 (01:52 -0400)
committerJeff Garzik <jeff@garzik.org>
Sun, 24 Sep 2006 05:52:47 +0000 (01:52 -0400)

Trivial merge