Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Dmitry Torokhov [Sat, 29 Apr 2006 05:11:23 +0000 (01:11 -0400)]

Trivial merge