Merging was easier than I thought; I only had to deal with the usual CVS "ignore stuff in ." lossage. I did that by hand, so there is a possibility I missed something, but that should be minor. temporary-21-5 should be synched to release-21-2 as of say 20 minutes ago. -- University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Institute of Policy and Planning Sciences Tel/fax: +81 (298) 53-5091 _________________ _________________ _________________ _________________ What are those straight lines for? "XEmacs rules."