Update of /cvsroot/htdocs/ja/Misc In directory mogu:/tmp/cvs-serv21411 Log Message: import 1.23 Status: Vendor Tag: TNF Release Tags: date-1999-05-13 C htdocs/ja/Misc/history.html 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja/Misc