K 10
svn:author
V 5
markm
K 8
svn:date
V 27
2001-12-20T14:25:46.000000Z
K 7
svn:log
V 118
Fix merge conflicts, and because this still has a zillion warnings,
protect the build with a WARNS=2.

Fix the build.

END