Merge branch 'vendor/ZLIB'
authorPeter Avalos <pavalos@dragonflybsd.org>
Wed, 15 Dec 2010 01:52:43 +0000 (15:52 -1000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Wed, 15 Dec 2010 01:52:43 +0000 (15:52 -1000)

Trivial merge