This commit was generated by cvs2svn to compensate for changes in r20, which
authortg <tg@mirbsd.org>
Mon, 9 Jun 2014 19:22:49 +0000 (19:22 +0000)
committertg <tg@mirbsd.org>
Mon, 9 Jun 2014 19:22:49 +0000 (19:22 +0000)
included commits to RCS files with non-trunk default branches.


Trivial merge