Automerge with /usr/src/ntfs-2.6.git.
authorAnton Altaparmakov <aia21@cantab.net>
Sat, 25 Jun 2005 13:27:27 +0000 (14:27 +0100)
committerAnton Altaparmakov <aia21@cantab.net>
Sat, 25 Jun 2005 13:27:27 +0000 (14:27 +0100)

Trivial merge