Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads

author Brian Behlendorf <behlendorf1@llnl.gov>

Tue, 18 Aug 2009 19:10:47 +0000 (12:10 -0700)

committer Brian Behlendorf <behlendorf1@llnl.gov>

Tue, 18 Aug 2009 19:10:47 +0000 (12:10 -0700)
author Brian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 Aug 2009 19:10:47 +0000 (12:10 -0700)
committer Brian Behlendorf <behlendorf1@llnl.gov>
Tue, 18 Aug 2009 19:10:47 +0000 (12:10 -0700)
diff --cc cmd/zdb/zdb.c
Simple merge
diff --cc cmd/ztest/ztest.c
Simple merge
author	Brian Behlendorf <behlendorf1@llnl.gov>
	Tue, 18 Aug 2009 19:10:47 +0000 (12:10 -0700)
committer	Brian Behlendorf <behlendorf1@llnl.gov>
	Tue, 18 Aug 2009 19:10:47 +0000 (12:10 -0700)
		1	2
cmd/zdb/zdb.c	patch \|	diff1 \|	diff2 \|	blob \| history
cmd/ztest/ztest.c	patch \|	diff1 \|	diff2 \|	blob \| history