From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 28 May 2010 22:46:10 +0000 (-0700)
Subject: Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=812761eac5d8d5b6e28ec3669266fe05c43fcec2;p=zfs

Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

Conflicts:
	cmd/ztest/ztest.c
---

812761eac5d8d5b6e28ec3669266fe05c43fcec2