Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
authorJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 18:21:24 +0000 (13:21 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 18:21:24 +0000 (13:21 -0500)

Trivial merge