This commit was generated by cvs2svn to compensate for changes in r8000, master
authoryamaoka <yamaoka>
Tue, 11 Apr 2006 22:55:25 +0000 (22:55 +0000)
committeryamaoka <yamaoka>
Tue, 11 Apr 2006 22:55:25 +0000 (22:55 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge