Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv25725 Log Message: Inport from TNF. Status: Vendor Tag: TNF Release Tags: date-2001-05-15 C htdocs/ja/index.html C htdocs/ja/Changes/index.list 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja