Merge ../ntfs-2.6-devel
authorAnton Altaparmakov <aia21@cantab.net>
Fri, 24 Feb 2006 10:04:22 +0000 (10:04 +0000)
committerAnton Altaparmakov <aia21@cantab.net>
Fri, 24 Feb 2006 10:04:22 +0000 (10:04 +0000)

Trivial merge