Module Name: htdocs Committed By: kano Date: Tue Jul 10 21:35:57 JST 2007 htdocs/ja Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv20183 Log Message: import from TNF. about/y2k.xml: 1.2 Status: Vendor Tag: TNF Release Tags: date-2007-07-10 C htdocs/ja/about/y2k.xml 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja