Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Tue, 19 Sep 2006 19:13:45 +0000 (15:13 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 19 Sep 2006 19:13:45 +0000 (15:13 -0400)

Trivial merge