Log Message: Merge tnftp 20050511. (Future merges should be easier as this time I froze the vendor RCSIDs)