Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 27 Apr 2006 08:53:34 +0000 (04:53 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 27 Apr 2006 08:53:34 +0000 (04:53 -0400)

Trivial merge