Automerge with /usr/src/ntfs-2.6.git.
authorAnton Altaparmakov <aia21@cantab.net>
Thu, 30 Jun 2005 08:52:20 +0000 (09:52 +0100)
committerAnton Altaparmakov <aia21@cantab.net>
Thu, 30 Jun 2005 08:52:20 +0000 (09:52 +0100)

Trivial merge