zfs crypto discuss - Jan 2008 - merge with the second merge, so i can merge with the original merge.. merge...merge..

Author: Anthony Scarpino <Anthony.Scarpino at Sun.COM>
Repository: /hg/zfs-crypto/gate
Latest revision: fee8391a645ff6747fc978b97533f5c2c654cabe
Total changesets: 1
Log message:
merge with the second merge, so i can merge with the original merge..
merge...merge..

Files:
	update: usr/src/lib/libzfs/common/libzfs_crypto.c
	update: usr/src/uts/common/fs/zfs/sys/zio_crypt.h
	update: usr/src/uts/common/fs/zfs/zio_crypt.c