From: Darik Horn <dajhorn@vanadac.com>
Date: Tue, 6 Dec 2011 02:09:57 +0000 (-0600)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/0.7.9-2~544
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=616912c61f7b29dfcfc7c7cb0a63770dd90ecbbb;p=mirror_zfs-debian.git

Merge branch 'upstream'
---

616912c61f7b29dfcfc7c7cb0a63770dd90ecbbb