Merge branch 'max-sect' into upstream
authorJeff Garzik <jeff@garzik.org>
Mon, 15 May 2006 15:27:47 +0000 (11:27 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 15 May 2006 15:27:47 +0000 (11:27 -0400)

Trivial merge