This commit was generated by cvs2svn to compensate for changes in r6200,
authoryamaoka <yamaoka>
Sat, 3 May 2003 11:32:48 +0000 (11:32 +0000)
committeryamaoka <yamaoka>
Sat, 3 May 2003 11:32:48 +0000 (11:32 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge