Fix hardcoded paths in ztest
Merge remote-tracking branch 'upstream/master' into master_clean
Merge branch 'master_clean' of https://github.com/jcumming/nixpkgs into master_clean
Merge remote-tracking branch 'upstream/master' into master_clean
Merge remote-tracking branch 'upstream/master' into master_clean
zfs-0.6.0-rc14, spl-0.6.0-rc14
Merge pull request #294 from jcumming/zfs.130201

zfs-0.6.0-rc14. spl-0.6.0-rc14