Module Name: htdocs Committed By: kano Date: Thu Aug 3 23:16:16 JST 2006 htdocs/ja Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv24679 Log Message: import from TNF. index.html: 1.1270 Status: Vendor Tag: TNF Release Tags: date-2006-08-03 C htdocs/ja/index.html 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja