This commit was generated by cvs2svn to compensate for changes in r6565,
authoryamaoka <yamaoka>
Tue, 30 Dec 2003 10:00:54 +0000 (10:00 +0000)
committeryamaoka <yamaoka>
Tue, 30 Dec 2003 10:00:54 +0000 (10:00 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge