This commit was generated by cvs2svn to compensate for changes in r155,
authormorioka <morioka>
Mon, 2 Mar 1998 14:39:01 +0000 (14:39 +0000)
committermorioka <morioka>
Mon, 2 Mar 1998 14:39:01 +0000 (14:39 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge