Module Name: htdocs Committed By: kano Date: Wed Jan 23 00:42:08 JST 2008 htdocs/ja Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv9135 Log Message: import from TNF. index.html: 1.1487 Status: Vendor Tag: TNF Release Tags: date-2008-01-23 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