2619 asynchronous destruction of ZFS file systems
2747 SPA versioning with zfs feature flags
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <gwilson@delphix.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com>
Approved by: Dan McDonald <danmcd@nexenta.com>

*** 20,29 ****
--- 20,30 ----
  #
  
  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
  # Copyright 2011 Joyent, Inc.  All rights reserved.
+ # Copyright (c) 2012 by Delphix. All rights reserved.
  
  include ../Makefile.master
  
  #
  #       Note that the commands 'agents', 'lp', 'perl', and 'man' are first in
*** 452,461 ****
--- 453,463 ----
          ypcmd           \
          yppasswd        \
          zdb             \
          zdump           \
          zfs             \
+         zhack           \
          zic             \
          zinject         \
          zlogin          \
          zoneadm         \
          zoneadmd        \