This commit was generated by cvs2svn to compensate for changes in r7, which
authorgreen <green>
Sun, 29 Nov 1998 16:48:16 +0000 (16:48 +0000)
committergreen <green>
Sun, 29 Nov 1998 16:48:16 +0000 (16:48 +0000)
included commits to RCS files with non-trunk default branches.


Trivial merge