This commit was generated by cvs2svn to compensate for changes in r1121,
authortomo <tomo>
Wed, 19 Jan 2000 05:20:10 +0000 (05:20 +0000)
committertomo <tomo>
Wed, 19 Jan 2000 05:20:10 +0000 (05:20 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge