Update of /cvsroot/htdocs/ja/Hardware In directory mogu:/tmp/cvs-serv18178 Log Message: Imported to update. Status: Vendor Tag: TNF Release Tags: date-2000-02-09 C htdocs/ja/Hardware/pci.html C htdocs/ja/Hardware/usb.html 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja/Hardware