Merge branch 'master' of /usr/src/ntfs-2.6/
authorAnton Altaparmakov <aia21@cantab.net>
Tue, 3 Jan 2006 12:51:07 +0000 (12:51 +0000)
committerAnton Altaparmakov <aia21@cantab.net>
Tue, 3 Jan 2006 12:51:07 +0000 (12:51 +0000)

Trivial merge