Merge branch 'master' of imp.csi.cam.ac.uk:/home/src/ntfs-2.6.git/
authorAnton Altaparmakov <aia21@hera.kernel.org>
Mon, 12 Sep 2005 15:25:52 +0000 (08:25 -0700)
committerAnton Altaparmakov <aia21@hera.kernel.org>
Mon, 12 Sep 2005 15:25:52 +0000 (08:25 -0700)

Trivial merge