This commit was generated by cvs2svn to compensate for changes in r4, which
authortg <tg@mirbsd.org>
Thu, 28 Jul 2011 16:50:59 +0000 (16:50 +0000)
committertg <tg@mirbsd.org>
Thu, 28 Jul 2011 16:50:59 +0000 (16:50 +0000)
included commits to RCS files with non-trunk default branches.


Trivial merge