Merge from vendor branch GROFF:
authorJeroen Ruigrok/asmodai <asmodai@dragonflybsd.org>
Sun, 28 Aug 2005 18:06:33 +0000 (18:06 +0000)
committerJeroen Ruigrok/asmodai <asmodai@dragonflybsd.org>
Sun, 28 Aug 2005 18:06:33 +0000 (18:06 +0000)
Update and reorder.


Trivial merge