Module Name: htdocs Committed By: kano Date: Sat Oct 14 09:59:14 JST 2006 htdocs/ja Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv8534 Log Message: import from TNF. index.html: 1.1295 Status: Vendor Tag: TNF Release Tags: date-2006-10-14 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