Update of /cvsroot/htdocs/ja/People In directory mogu:/tmp/cvs-serv28385 Log Message: import TNF 1.155. Status: Vendor Tag: TNF Release Tags: date-2002-11-28 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