Merge branch 'master' of /usr/src/ntfs-2.6/
authorAnton Altaparmakov <aia21@cantab.net>
Thu, 19 Jan 2006 16:39:33 +0000 (16:39 +0000)
committerAnton Altaparmakov <aia21@cantab.net>
Thu, 19 Jan 2006 16:39:33 +0000 (16:39 +0000)

Trivial merge