merge conflicts
use cleantags, instead of home grown copy.
openldap2netbsd - script to munge rcsids, and otherwise prepare for import