Merge branch 'master' of git://imp.csi.cam.ac.uk/home/src/ntfs-2.6-devel/