Module Name: htdocs Committed By: kano Date: Fri Nov 30 07:43:54 JST 2007 htdocs/ja Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv9550 Log Message: import from TNF. index.html: 1.1463 Status: Vendor Tag: TNF Release Tags: date-2007-11-29 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