Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Sat, 17 Feb 2007 20:11:43 +0000 (15:11 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 17 Feb 2007 20:11:43 +0000 (15:11 -0500)

Trivial merge