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

Trivial merge