This commit was generated by cvs2svn to compensate for changes in r8, which
authortg <tg@mirbsd.org>
Sun, 25 Mar 2012 15:59:13 +0000 (15:59 +0000)
committertg <tg@mirbsd.org>
Sun, 25 Mar 2012 15:59:13 +0000 (15:59 +0000)
included commits to RCS files with non-trunk default branches.


Trivial merge