This commit was generated by cvs2svn to compensate for changes in r11551,
authortomo <tomo>
Tue, 23 May 2006 15:02:25 +0000 (15:02 +0000)
committertomo <tomo>
Tue, 23 May 2006 15:02:25 +0000 (15:02 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge