Merge branch 'master' of git://imp.csi.cam.ac.uk/home/src/ntfs-2.6-devel/
authorAnton Altaparmakov <aia21@hera.kernel.org>
Thu, 23 Mar 2006 17:08:12 +0000 (17:08 +0000)
committerAnton Altaparmakov <aia21@hera.kernel.org>
Thu, 23 Mar 2006 17:08:12 +0000 (17:08 +0000)

Trivial merge