From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 18 May 2010 21:33:19 +0000 (-0700)
Subject: Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
X-Git-Tag: zfs-0.4.9~7^2^2^2^2~6^2~1^2^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=684177618ad03b8638b486a87e05a20efda33f48;p=zfs

Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
---

684177618ad03b8638b486a87e05a20efda33f48