4775 Typo in getaddrinfo(3SOCKET) man page
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Andy Stormont <andyjstormont@gmail.com>
Approved by: Dan McDonald <danmcd@omniti.com>
4878 bug with printf and missing unsigned argument
Reviewed by: Andy Stormont <andyjstormont@gmail.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Approved by: Dan McDonald <danmcd@omniti.com>
3835 zfs need not store 2 copies of all metadata
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
	[illumos-gate merge]

commit edf345e6b8342e8627ec20ce821a977a62cee19d
    3835 zfs need not store 2 copies of all metadata
commit e56bd28502ece54c39ad86fd96643790902bb93e
    4878 bug with printf and missing unsigned argument
commit fec8e666848d54d90131b7c7d63132a3168697c2
    4775 Typo in getaddrinfo(3SOCKET) man page

Conflicts:
	usr/src/uts/common/fs/zfs/dmu.c (copyrights)