Update of /cvsroot/htdocs/ja/People In directory mogu:/tmp/cvs-serv1649 Log Message: Import TNF 1.140 Status: Vendor Tag: TNF Release Tags: date-2002-06-25 C htdocs/ja/People/supporting-cast.data 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja/People