Merge branch 'master' of /usr/src/ntfs-2.6/
authorAnton Altaparmakov <aia21@cantab.net>
Sun, 30 Oct 2005 21:00:04 +0000 (21:00 +0000)
committerAnton Altaparmakov <aia21@cantab.net>
Sun, 30 Oct 2005 21:00:04 +0000 (21:00 +0000)

Trivial merge