Merge from vendor branch FILE:
authorPeter Avalos <pavalos@dragonflybsd.org>
Mon, 28 May 2007 18:42:39 +0000 (18:42 +0000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Mon, 28 May 2007 18:42:39 +0000 (18:42 +0000)
Update to file 4.21 which is a bugfix release including an integer
overflow.  See Changelog for more changes.


Trivial merge