This commit was generated by cvs2svn to compensate for changes in r8690,
authorivan <ivan>
Thu, 31 Dec 2009 13:16:41 +0000 (13:16 +0000)
committerivan <ivan>
Thu, 31 Dec 2009 13:16:41 +0000 (13:16 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge