Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Jaroslav Kysela [Wed, 22 Jun 2005 10:19:24 +0000 (12:19 +0200)]

Trivial merge