spl-0.6.1, zfs-0.6.1
Don't need NIX_CFLAGS_COMPILE in spl build anymore, consolodate zfs patches.
Merge pull request #451 from jcumming/zfs.130328

zfs-0.6.1. spl-0.6.1