Update of /cvsroot/htdocs/ja/Hardware In directory mogu:/tmp/cvs-serv9277 Log Message: Import TNF 1.7. Status: Vendor Tag: TNF Release Tags: date-2000-08-09 C htdocs/ja/Hardware/cardbus.html 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja/Hardware