Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorJeremy Allison <jra@samba.org>
Thu, 23 Jun 2005 00:35:06 +0000 (17:35 -0700)
committerSteve French <sfrench@hera.kernel.org>
Thu, 23 Jun 2005 00:35:06 +0000 (17:35 -0700)

Trivial merge