This commit was generated by cvs2svn to compensate for changes in r13, which
authortg <tg@mirbsd.org>
Sat, 14 Apr 2012 12:56:19 +0000 (12:56 +0000)
committertg <tg@mirbsd.org>
Sat, 14 Apr 2012 12:56:19 +0000 (12:56 +0000)
included commits to RCS files with non-trunk default branches.


Trivial merge