This commit was generated by cvs2svn to compensate for changes in r311,
authormorioka <morioka>
Mon, 9 Mar 1998 15:56:57 +0000 (15:56 +0000)
committermorioka <morioka>
Mon, 9 Mar 1998 15:56:57 +0000 (15:56 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge