Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv9713 Log Message: Import from TNF. Status: Vendor Tag: TNF Release Tags: date-2001-04-04 C htdocs/ja/Ports/macppc/faq.list C htdocs/ja/gallery/events.list 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja