Merge branch 'upstream-2.6.17'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:45:00 +0000 (02:45 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:45:00 +0000 (02:45 -0500)

Trivial merge