Merge last 3.0 fixes.
authorJelmer Vernooij <jelmer@samba.org>
Fri, 8 Dec 2006 20:06:12 +0000 (21:06 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 8 Dec 2006 20:06:12 +0000 (21:06 +0100)

Trivial merge