Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Tue, 12 Sep 2006 16:03:21 +0000 (12:03 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 12 Sep 2006 16:03:21 +0000 (12:03 -0400)

Trivial merge