Merge ../ntfs-2.6-devel