Automatic merge with /usr/src/ntfs-2.6.git.
authorAnton Altaparmakov <aia21@cantab.net>
Thu, 23 Jun 2005 10:26:22 +0000 (11:26 +0100)
committerAnton Altaparmakov <aia21@cantab.net>
Thu, 23 Jun 2005 10:26:22 +0000 (11:26 +0100)

Trivial merge