Module Name: htdocs Committed By: kano Date: Mon Aug 9 22:01:57 JST 2010 htdocs/ja Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv3171 Log Message: import from TNF. index.html: 1.1658 Status: Vendor Tag: TNF Release Tags: date-2010-08-09 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