This commit was generated by cvs2svn to compensate for changes in r10640,
authorivan <ivan>
Thu, 17 Feb 2011 00:25:23 +0000 (00:25 +0000)
committerivan <ivan>
Thu, 17 Feb 2011 00:25:23 +0000 (00:25 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge