This commit was generated by cvs2svn to compensate for changes in r8593,
authorivan <ivan>
Fri, 18 Dec 2009 00:41:34 +0000 (00:41 +0000)
committerivan <ivan>
Fri, 18 Dec 2009 00:41:34 +0000 (00:41 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge