Automatic merge of rsync://www.fr.zoreil.com/linux-2.6.git branch HEAD
author <jgarzik@pretzel.yyz.us> <>
Sat, 28 May 2005 00:12:17 +0000 (20:12 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 28 May 2005 00:12:17 +0000 (20:12 -0400)

Trivial merge