merge in NFS code from Rick Macklem