Merge admin fixes.
authorJelmer Vernooij <jelmer@samba.org>
Mon, 12 Feb 2007 23:47:28 +0000 (00:47 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 12 Feb 2007 23:47:28 +0000 (00:47 +0100)

Trivial merge