This commit was generated by cvs2svn to compensate for changes in r12472,
authorivan <ivan>
Sat, 21 Jan 2012 03:46:24 +0000 (03:46 +0000)
committerivan <ivan>
Sat, 21 Jan 2012 03:46:24 +0000 (03:46 +0000)
which included commits to RCS files with non-trunk default branches.


Trivial merge