Merge branch 'master' into upstream-fixes
authorJeff Garzik <jeff@garzik.org>
Wed, 24 Jan 2007 07:14:25 +0000 (02:14 -0500)
committerJeff Garzik <jeff@garzik.org>
Wed, 24 Jan 2007 07:14:25 +0000 (02:14 -0500)

Trivial merge