Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorJaroslav Kysela <perex@tm8103>
Mon, 7 Nov 2005 10:02:51 +0000 (11:02 +0100)
committerJaroslav Kysela <perex@tm8103>
Mon, 7 Nov 2005 10:02:51 +0000 (11:02 +0100)

Trivial merge