Update of /cvsroot/htdocs/ja/Ports/i386 In directory mogu:/tmp/cvs-serv29768 Log Message: Import TNF 1.6. Status: Vendor Tag: TNF Release Tags: date-2000-05-16 C htdocs/ja/Ports/i386/hardware.html 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja/Ports/i386