Module Name: htdocs Committed By: kano Date: Sat Aug 5 09:38:55 JST 2006 htdocs/ja Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv2774 Log Message: import from TNF. index.html: 1.1272 Status: Vendor Tag: TNF Release Tags: date-2006-08-05 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