zfs crypto discuss - Nov 2007 - Fix mismerge for libcryptoutil & libpkcs11

Author: Darren Moffat <darrenm at opensolaris.org>
Repository: /hg/zfs-crypto/zfs-crypto-gate
Latest revision: ec659b717bdb149af4dc7a2ac1bc1c152d859b02
Total changesets: 1
Log message:
Fix mismerge for libcryptoutil & libpkcs11

Files:
	update: usr/src/lib/libcryptoutil/common/cryptoutil.h
	update: usr/src/lib/libcryptoutil/common/mapfile-vers
	update: usr/src/lib/libcryptoutil/common/passutils.c
	update: usr/src/lib/pkcs11/libpkcs11/common/mapfile-vers
	update: usr/src/lib/pkcs11/libpkcs11/common/pkcs11SUNWExtensions.c