merged from bsd1 - added a DRYRUN option, fixed a bug in merge.pl and updated nsswitch.conf