Merge branch 'vendor/FILE'
authorPeter Avalos <pavalos@dragonflybsd.org>
Wed, 21 Sep 2011 02:34:15 +0000 (19:34 -0700)
committerPeter Avalos <pavalos@dragonflybsd.org>
Wed, 21 Sep 2011 02:34:15 +0000 (19:34 -0700)
1  2 
contrib/file/src/apprentice.c

Simple merge