Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Steve French [Sun, 20 Nov 2005 05:05:42 +0000 (21:05 -0800)]

Trivial merge