Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Mon, 4 Sep 2006 10:29:54 +0000 (06:29 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 4 Sep 2006 10:29:54 +0000 (06:29 -0400)

Trivial merge