Merge ipv6 fixes.
authorJelmer Vernooij <jelmer@samba.org>
Fri, 8 Dec 2006 23:28:53 +0000 (00:28 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 8 Dec 2006 23:28:53 +0000 (00:28 +0100)

Trivial merge