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


Trivial merge